diff options
author | Dan Willemsen <dwillemsen@google.com> | 2015-10-27 23:27:46 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2015-10-27 23:27:46 +0000 |
commit | ca249e444bd59c5b2c3a094108f6c489f8ce80e1 (patch) | |
tree | 1fd03f46c5c1ada6678ea667f1d6537e01f4a68c | |
parent | 106fb85b42000d085329fbd6bb6cc1d2ac47317d (diff) | |
parent | a73b059815fc35ba689e5a8235b567b2353eabad (diff) | |
download | fdk-aac-ca249e444bd59c5b2c3a094108f6c489f8ce80e1.tar.gz fdk-aac-ca249e444bd59c5b2c3a094108f6c489f8ce80e1.tar.bz2 fdk-aac-ca249e444bd59c5b2c3a094108f6c489f8ce80e1.zip |
Merge "Remove __DATE__/__TIME__"
am: a73b059815
* commit 'a73b059815fc35ba689e5a8235b567b2353eabad':
Remove __DATE__/__TIME__
-rw-r--r-- | libAACdec/src/aacdecoder_lib.cpp | 5 | ||||
-rw-r--r-- | libAACenc/src/aacenc_lib.cpp | 5 | ||||
-rw-r--r-- | libFDK/src/FDK_core.cpp | 5 | ||||
-rw-r--r-- | libMpegTPDec/src/tpdec_lib.cpp | 5 | ||||
-rw-r--r-- | libMpegTPDec/src/version | 5 | ||||
-rw-r--r-- | libMpegTPEnc/src/tpenc_lib.cpp | 5 | ||||
-rw-r--r-- | libMpegTPEnc/src/version | 5 | ||||
-rw-r--r-- | libPCMutils/src/pcmutils_lib.cpp | 5 | ||||
-rw-r--r-- | libSBRdec/src/sbrdecoder.cpp | 5 | ||||
-rw-r--r-- | libSBRenc/src/sbr_encoder.cpp | 5 | ||||
-rw-r--r-- | libSYS/src/genericStds.cpp | 5 |
11 files changed, 55 insertions, 0 deletions
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 49f8225..63563fd 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 cd22171..e6ac3ff 100644 --- a/libPCMutils/src/pcmutils_lib.cpp +++ b/libPCMutils/src/pcmutils_lib.cpp @@ -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. 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 72b5467..47d62fc 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> |