Merge remote-tracking branch 'aosp/master' into update

12 files changed, 69 insertions, 11 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 := \
diff --git a/libAACdec/src/aacdecoder_lib.cpp b/libAACdec/src/aacdecoder_lib.cpp
index 82f85ab..94eb3c0 100644
--- a/libAACdec/src/aacdecoder_lib.cpp
+++ b/libAACdec/src/aacdecoder_lib.cpp
@@ -112,8 +112,13 @@ amm-info@iis.fraunhofer.de
 #define AACDECODER_LIB_VL1 5
 #define AACDECODER_LIB_VL2 10
 #define AACDECODER_LIB_TITLE "AAC Decoder Lib"
+#ifdef __ANDROID__
+#define AACDECODER_LIB_BUILD_DATE ""
+#define AACDECODER_LIB_BUILD_TIME ""
+#else
 #define AACDECODER_LIB_BUILD_DATE __DATE__
 #define AACDECODER_LIB_BUILD_TIME __TIME__
+#endif
 
 static AAC_DECODER_ERROR
 setConcealMethod ( const HANDLE_AACDECODER  self,
diff --git a/libAACenc/src/aacenc_lib.cpp b/libAACenc/src/aacenc_lib.cpp
index 95c08b3..bb10c4f 100644
--- a/libAACenc/src/aacenc_lib.cpp
+++ b/libAACenc/src/aacenc_lib.cpp
@@ -100,8 +100,13 @@ amm-info@iis.fraunhofer.de
 #define AACENCODER_LIB_VL1 4
 #define AACENCODER_LIB_VL2 12
 #define AACENCODER_LIB_TITLE "AAC Encoder"
+#ifdef __ANDROID__
+#define AACENCODER_LIB_BUILD_DATE ""
+#define AACENCODER_LIB_BUILD_TIME ""
+#else
 #define AACENCODER_LIB_BUILD_DATE __DATE__
 #define AACENCODER_LIB_BUILD_TIME __TIME__
+#endif
 
 
 #include "sbr_encoder.h"
diff --git a/libFDK/src/FDK_core.cpp b/libFDK/src/FDK_core.cpp
index 6db648d..a706eb0 100644
--- a/libFDK/src/FDK_core.cpp
+++ b/libFDK/src/FDK_core.cpp
@@ -95,8 +95,13 @@ amm-info@iis.fraunhofer.de
 #define FDK_TOOLS_LIB_VL1 3
 #define FDK_TOOLS_LIB_VL2 2
 #define FDK_TOOLS_LIB_TITLE "FDK Tools"
+#ifdef __ANDROID__
+#define FDK_TOOLS_LIB_BUILD_DATE ""
+#define FDK_TOOLS_LIB_BUILD_TIME ""
+#else
 #define FDK_TOOLS_LIB_BUILD_DATE __DATE__
 #define FDK_TOOLS_LIB_BUILD_TIME __TIME__
+#endif
 
 int FDK_toolsGetLibInfo(LIB_INFO *info)
 {
diff --git a/libMpegTPDec/src/tpdec_lib.cpp b/libMpegTPDec/src/tpdec_lib.cpp
index 1f9f29b..445615d 100644
--- a/libMpegTPDec/src/tpdec_lib.cpp
+++ b/libMpegTPDec/src/tpdec_lib.cpp
@@ -1268,8 +1268,13 @@ TRANSPORTDEC_ERROR transportDec_GetLibInfo( LIB_INFO *info )
   info += i;
 
   info->module_id  = FDK_TPDEC;
+#ifdef __ANDROID__
+  info->build_date = "";
+  info->build_time = "";
+#else
   info->build_date = __DATE__;
   info->build_time = __TIME__;
+#endif
   info->title      = TP_LIB_TITLE;
   info->version    = LIB_VERSION(TP_LIB_VL0, TP_LIB_VL1, TP_LIB_VL2);
   LIB_VERSION_STRING(info);
diff --git a/libMpegTPDec/src/version b/libMpegTPDec/src/version
index cda01c8..fc7e5f0 100644
--- a/libMpegTPDec/src/version
+++ b/libMpegTPDec/src/version
@@ -4,5 +4,10 @@
 #define TP_LIB_VL1 3
 #define TP_LIB_VL2 4
 #define TP_LIB_TITLE "MPEG Transport"
+#ifdef __ANDROID__
+#define TP_LIB_BUILD_DATE ""
+#define TP_LIB_BUILD_TIME ""
+#else
 #define TP_LIB_BUILD_DATE __DATE__
 #define TP_LIB_BUILD_TIME __TIME__
+#endif
diff --git a/libMpegTPEnc/src/tpenc_lib.cpp b/libMpegTPEnc/src/tpenc_lib.cpp
index d0a2fec..24fb32f 100644
--- a/libMpegTPEnc/src/tpenc_lib.cpp
+++ b/libMpegTPEnc/src/tpenc_lib.cpp
@@ -619,8 +619,13 @@ TRANSPORTENC_ERROR transportEnc_GetLibInfo( LIB_INFO *info )
   info->module_id = FDK_TPENC;
   info->version = LIB_VERSION(TP_LIB_VL0, TP_LIB_VL1, TP_LIB_VL2);
   LIB_VERSION_STRING(info);
+#ifdef __ANDROID__
+  info->build_date = "";
+  info->build_time = "";
+#else
   info->build_date = __DATE__;
   info->build_time = __TIME__;
+#endif
   info->title = TP_LIB_TITLE;
 
   /* Set flags */
diff --git a/libMpegTPEnc/src/version b/libMpegTPEnc/src/version
index cda01c8..fc7e5f0 100644
--- a/libMpegTPEnc/src/version
+++ b/libMpegTPEnc/src/version
@@ -4,5 +4,10 @@
 #define TP_LIB_VL1 3
 #define TP_LIB_VL2 4
 #define TP_LIB_TITLE "MPEG Transport"
+#ifdef __ANDROID__
+#define TP_LIB_BUILD_DATE ""
+#define TP_LIB_BUILD_TIME ""
+#else
 #define TP_LIB_BUILD_DATE __DATE__
 #define TP_LIB_BUILD_TIME __TIME__
+#endif
diff --git a/libPCMutils/src/pcmutils_lib.cpp b/libPCMutils/src/pcmutils_lib.cpp
index 32d8437..e6ac3ff 100644
--- a/libPCMutils/src/pcmutils_lib.cpp
+++ b/libPCMutils/src/pcmutils_lib.cpp
@@ -88,7 +88,7 @@ amm-info@iis.fraunhofer.de
                 expansion in the PCM time domain.
 
 *******************************************************************************/
-
+#include <log/log.h>
 #include "pcmutils_lib.h"
 
 #include "genericStds.h"
@@ -150,8 +150,13 @@ amm-info@iis.fraunhofer.de
 #define PCMDMX_LIB_VL1 4
 #define PCMDMX_LIB_VL2 2
 #define PCMDMX_LIB_TITLE "PCM Downmix Lib"
+#ifdef __ANDROID__
+#define PCMDMX_LIB_BUILD_DATE ""
+#define PCMDMX_LIB_BUILD_TIME ""
+#else
 #define PCMDMX_LIB_BUILD_DATE __DATE__
 #define PCMDMX_LIB_BUILD_TIME __TIME__
+#endif
 
 
 /* Fixed and unique channel group indices.
@@ -2073,7 +2078,10 @@ PCMDMX_ERROR pcmDmx_ApplyFrame (
           map[ch++]  = inCh;
         }
       }
-      FDK_ASSERT(ch == numInChannels);
+      if (ch != numInChannels) {
+          ALOGE("b/23876444");
+          return PCMDMX_INVALID_ARGUMENT;
+      }
 
       /* Remove unused cols from factor matrix */
       for (inCh=0; inCh < numInChannels; inCh+=1) {
diff --git a/libSBRdec/src/sbrdecoder.cpp b/libSBRdec/src/sbrdecoder.cpp
index 16b0bbc..619e4fd 100644
--- a/libSBRdec/src/sbrdecoder.cpp
+++ b/libSBRdec/src/sbrdecoder.cpp
@@ -139,8 +139,13 @@ amm-info@iis.fraunhofer.de
 #define SBRDECODER_LIB_VL1 2
 #define SBRDECODER_LIB_VL2 6
 #define SBRDECODER_LIB_TITLE "SBR Decoder"
+#ifdef __ANDROID__
+#define SBRDECODER_LIB_BUILD_DATE ""
+#define SBRDECODER_LIB_BUILD_TIME ""
+#else
 #define SBRDECODER_LIB_BUILD_DATE __DATE__
 #define SBRDECODER_LIB_BUILD_TIME __TIME__
+#endif
 
 
 
diff --git a/libSBRenc/src/sbr_encoder.cpp b/libSBRenc/src/sbr_encoder.cpp
index 3e95d6b..464c013 100644
--- a/libSBRenc/src/sbr_encoder.cpp
+++ b/libSBRenc/src/sbr_encoder.cpp
@@ -2331,8 +2331,13 @@ INT sbrEncoder_GetLibInfo( LIB_INFO *info )
   info->module_id = FDK_SBRENC;
   info->version = LIB_VERSION(SBRENCODER_LIB_VL0, SBRENCODER_LIB_VL1, SBRENCODER_LIB_VL2);
   LIB_VERSION_STRING(info);
+#ifdef __ANDROID__
+  info->build_date = "";
+  info->build_time = "";
+#else
   info->build_date = __DATE__;
   info->build_time = __TIME__;
+#endif
   info->title = "SBR Encoder";
 
   /* Set flags */
diff --git a/libSYS/src/genericStds.cpp b/libSYS/src/genericStds.cpp
index f405483..affa90b 100644
--- a/libSYS/src/genericStds.cpp
+++ b/libSYS/src/genericStds.cpp
@@ -101,8 +101,13 @@ amm-info@iis.fraunhofer.de
 #define SYS_LIB_VL1 3
 #define SYS_LIB_VL2 6
 #define SYS_LIB_TITLE "System Integration Library"
+#ifdef __ANDROID__
+#define SYS_LIB_BUILD_DATE ""
+#define SYS_LIB_BUILD_TIME ""
+#else
 #define SYS_LIB_BUILD_DATE __DATE__
 #define SYS_LIB_BUILD_TIME __TIME__
+#endif
 
   #include <stdlib.h>
   #include <stdio.h>