diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2015-08-12 00:39:04 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-12 00:39:04 +0000 |
| commit | 9f1b9bb71019b9a773d847cec6f10c198cd6c459 (patch) | |
| tree | a22b13b70f12b047337f696c4292aaa1702d8562 | |
| parent | 267940f5bd089940840f1dcdc744e10dbd8df254 (diff) | |
| parent | 5e7b21bb954dcf74533a1725be62cf6bffcb34ce (diff) | |
| download | fdk-aac-9f1b9bb71019b9a773d847cec6f10c198cd6c459.tar.gz fdk-aac-9f1b9bb71019b9a773d847cec6f10c198cd6c459.tar.bz2 fdk-aac-9f1b9bb71019b9a773d847cec6f10c198cd6c459.zip | |
am 5e7b21bb: Merge "build: wildcard isn\'t guaranteed to be sorted"
* commit '5e7b21bb954dcf74533a1725be62cf6bffcb34ce':
build: wildcard isn't guaranteed to be sorted
| -rw-r--r-- | Android.mk | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -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 := \ |