summaryrefslogtreecommitdiffstats
path: root/libMpegTPEnc
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2015-10-22 14:21:12 -0700
committerThe Android Automerger <android-build@google.com>2015-11-03 14:34:52 -0800
commit48b330d303727e1f2671f844a1d541d596f6d5da (patch)
tree510b410f66a888a5d517cacbac717cdfde055115 /libMpegTPEnc
parent9f42dfb7990a107da23454669459bb5e28d90726 (diff)
downloadandroid_external_aac-48b330d303727e1f2671f844a1d541d596f6d5da.tar.gz
android_external_aac-48b330d303727e1f2671f844a1d541d596f6d5da.tar.bz2
android_external_aac-48b330d303727e1f2671f844a1d541d596f6d5da.zip
Building __DATE__/__TIME__ into the binaries means that every build will create different binaries, even if all the sources are identical. This also means that any libraries including this one will need to be patched during every OTA. Nothing appears to use the build_date/build_time fields, so just replace them with empty strings. Bug: 24204119 Change-Id: I9543eb388a1e8ab9284df9035a62fc8942cdc082 (cherry picked from commit 6e8330732f61d1da1485fc07b61444f490d5e623)
Diffstat (limited to 'libMpegTPEnc')
-rw-r--r--libMpegTPEnc/src/tpenc_lib.cpp5
-rw-r--r--libMpegTPEnc/src/version5
2 files changed, 10 insertions, 0 deletions
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