diff options
author | Timothy Gu <timothygu99@gmail.com> | 2016-01-26 11:57:49 -0800 |
---|---|---|
committer | Timothy Gu <timothygu99@gmail.com> | 2016-01-26 11:57:49 -0800 |
commit | c8ad7a2ef919a54e2549df097bcf37838e6381b1 (patch) | |
tree | 735fe06eedc3ffa43956f9adad4765c3b244e002 /libFDK | |
parent | 047376af8c47d45c78204112a7d1b873c93822bc (diff) | |
parent | ca249e444bd59c5b2c3a094108f6c489f8ce80e1 (diff) | |
download | fdk-aac-c8ad7a2ef919a54e2549df097bcf37838e6381b1.tar.gz fdk-aac-c8ad7a2ef919a54e2549df097bcf37838e6381b1.tar.bz2 fdk-aac-c8ad7a2ef919a54e2549df097bcf37838e6381b1.zip |
Merge remote-tracking branch 'aosp/master' into update
Diffstat (limited to 'libFDK')
-rw-r--r-- | libFDK/src/FDK_core.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
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) { |