summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2015-10-27 17:52:13 -0700
committerThe Android Automerger <android-build@google.com>2015-11-03 14:34:53 -0800
commit533e5a7f03b976e2fa621e722394f1e4891f340e (patch)
tree0614b01ef1aba458d2c631aa9ecc69560956e105
parent66be90d7a0ec3c84a9ea30058c4878e2a8d7e48a (diff)
downloadandroid_external_libavc-533e5a7f03b976e2fa621e722394f1e4891f340e.tar.gz
android_external_libavc-533e5a7f03b976e2fa621e722394f1e4891f340e.tar.bz2
android_external_libavc-533e5a7f03b976e2fa621e722394f1e4891f340e.zip
Remove __DATE__/__TIME__ from Android builds
This removes unnecessary changes from build to build. Bug: 24204119 Change-Id: I25258314fe56ea186d38d756fb5fb04aa689a812 (cherry picked from commit f197ccb7562bac6f5bae40c9cb9dbb46a77baeb5)
-rw-r--r--decoder/ih264d_api.c7
-rw-r--r--encoder/ih264e_version.c7
2 files changed, 14 insertions, 0 deletions
diff --git a/decoder/ih264d_api.c b/decoder/ih264d_api.c
index fc21a06..cd91483 100644
--- a/decoder/ih264d_api.c
+++ b/decoder/ih264d_api.c
@@ -103,10 +103,17 @@
#define CODEC_RELEASE_VER "05.00"
#define CODEC_VENDOR "ITTIAM"
#define MAXVERSION_STRLEN 511
+#ifdef __ANDROID__
+#define VERSION(version_string, codec_name, codec_release_type, codec_release_ver, codec_vendor) \
+ snprintf(version_string, MAXVERSION_STRLEN, \
+ "@(#)Id:%s_%s Ver:%s Released by %s", \
+ codec_name, codec_release_type, codec_release_ver, codec_vendor)
+#else
#define VERSION(version_string, codec_name, codec_release_type, codec_release_ver, codec_vendor) \
snprintf(version_string, MAXVERSION_STRLEN, \
"@(#)Id:%s_%s Ver:%s Released by %s Build: %s @ %s", \
codec_name, codec_release_type, codec_release_ver, codec_vendor, __DATE__, __TIME__)
+#endif
#define MIN_IN_BUFS 1
diff --git a/encoder/ih264e_version.c b/encoder/ih264e_version.c
index 173f17c..e66e1ad 100644
--- a/encoder/ih264e_version.c
+++ b/encoder/ih264e_version.c
@@ -85,10 +85,17 @@
* Concatenates various strings to form a version string
*******************************************************************************
*/
+#ifdef __ANDROID__
+#define VERSION(version_string, codec_name, codec_release_type, codec_release_ver, codec_vendor) \
+ snprintf(version_string, MAX_STRLEN, \
+ "@(#)Id:%s_%s Ver:%s Released by %s", \
+ codec_name, codec_release_type, codec_release_ver, codec_vendor)
+#else
#define VERSION(version_string, codec_name, codec_release_type, codec_release_ver, codec_vendor) \
snprintf(version_string, MAX_STRLEN, \
"@(#)Id:%s_%s Ver:%s Released by %s Build: %s @ %s", \
codec_name, codec_release_type, codec_release_ver, codec_vendor, __DATE__, __TIME__)
+#endif
/*****************************************************************************/
/* Function Definitions */