commit 106fb85b42000d085329fbd6bb6cc1d2ac47317d
author Marco Nelissen <marcone@google.com> Tue Sep 15 02:12:36 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 15 02:12:36 2015 +0000
tree d7fe3a5b926fb435fb4e83eba0c6dc2d05e5ee1a
parent 8e8d92070887105d686f67f0a049c9cdefb8a919
parent 9f42dfb7990a107da23454669459bb5e28d90726

am 9f42dfb7: am b3c5a4bb: Fix crash on invalid channel config

* commit '9f42dfb7990a107da23454669459bb5e28d90726':
  Fix crash on invalid channel config

Android.mk

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 := \