aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2015-08-07 13:51:09 -0700
committerDan Willemsen <dwillemsen@google.com>2015-08-07 13:51:09 -0700
commitf170f89906d78314d063c594f4dd2c94f4f35392 (patch)
treea22b13b70f12b047337f696c4292aaa1702d8562
parentf2df045ae92ee655481f73b19986084308ae684c (diff)
downloadfdk-aac-f170f89906d78314d063c594f4dd2c94f4f35392.tar.gz
fdk-aac-f170f89906d78314d063c594f4dd2c94f4f35392.tar.bz2
fdk-aac-f170f89906d78314d063c594f4dd2c94f4f35392.zip
build: wildcard isn't guaranteed to be sorted
To prevent this from changing between builds, wrap in $(sort ) Change-Id: I0571d7d8787a40ca107c7c735d79692d27bed06e
-rw-r--r--Android.mk18
1 files changed, 9 insertions, 9 deletions
diff --git a/Android.mk b/Android.mk
index cfd5113..4c28670 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,31 +1,31 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
-aacdec_sources := $(wildcard $(LOCAL_PATH)/libAACdec/src/*.cpp)
+aacdec_sources := $(sort $(wildcard $(LOCAL_PATH)/libAACdec/src/*.cpp))
aacdec_sources := $(aacdec_sources:$(LOCAL_PATH)/libAACdec/src/%=%)
-aacenc_sources := $(wildcard $(LOCAL_PATH)/libAACenc/src/*.cpp)
+aacenc_sources := $(sort $(wildcard $(LOCAL_PATH)/libAACenc/src/*.cpp))
aacenc_sources := $(aacenc_sources:$(LOCAL_PATH)/libAACenc/src/%=%)
-pcmutils_sources := $(wildcard $(LOCAL_PATH)/libPCMutils/src/*.cpp)
+pcmutils_sources := $(sort $(wildcard $(LOCAL_PATH)/libPCMutils/src/*.cpp))
pcmutils_sources := $(pcmutils_sources:$(LOCAL_PATH)/libPCMutils/src/%=%)
-fdk_sources := $(wildcard $(LOCAL_PATH)/libFDK/src/*.cpp)
+fdk_sources := $(sort $(wildcard $(LOCAL_PATH)/libFDK/src/*.cpp))
fdk_sources := $(fdk_sources:$(LOCAL_PATH)/libFDK/src/%=%)
-sys_sources := $(wildcard $(LOCAL_PATH)/libSYS/src/*.cpp)
+sys_sources := $(sort $(wildcard $(LOCAL_PATH)/libSYS/src/*.cpp))
sys_sources := $(sys_sources:$(LOCAL_PATH)/libSYS/src/%=%)
-mpegtpdec_sources := $(wildcard $(LOCAL_PATH)/libMpegTPDec/src/*.cpp)
+mpegtpdec_sources := $(sort $(wildcard $(LOCAL_PATH)/libMpegTPDec/src/*.cpp))
mpegtpdec_sources := $(mpegtpdec_sources:$(LOCAL_PATH)/libMpegTPDec/src/%=%)
-mpegtpenc_sources := $(wildcard $(LOCAL_PATH)/libMpegTPEnc/src/*.cpp)
+mpegtpenc_sources := $(sort $(wildcard $(LOCAL_PATH)/libMpegTPEnc/src/*.cpp))
mpegtpenc_sources := $(mpegtpenc_sources:$(LOCAL_PATH)/libMpegTPEnc/src/%=%)
-sbrdec_sources := $(wildcard $(LOCAL_PATH)/libSBRdec/src/*.cpp)
+sbrdec_sources := $(sort $(wildcard $(LOCAL_PATH)/libSBRdec/src/*.cpp))
sbrdec_sources := $(sbrdec_sources:$(LOCAL_PATH)/libSBRdec/src/%=%)
-sbrenc_sources := $(wildcard $(LOCAL_PATH)/libSBRenc/src/*.cpp)
+sbrenc_sources := $(sort $(wildcard $(LOCAL_PATH)/libSBRenc/src/*.cpp))
sbrenc_sources := $(sbrenc_sources:$(LOCAL_PATH)/libSBRenc/src/%=%)
LOCAL_SRC_FILES := \