aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2015-10-22 14:46:59 -0700
committerDan Willemsen <dwillemsen@google.com>2015-10-30 21:57:47 +0000
commitd0e536147e32121b3c3d609216d04283fcf520a5 (patch)
treeb282ee4fb1b165ed118025dd54a18f0ec72ee7c2
parentc7d448429fa264787d231d20bb1d8e2e273e852b (diff)
downloadwebrtc-marshmallow-dr1.6-release.tar.gz
Including __DATE__ and __TIME__ in the binary means that every build of this library is different, even if the sources are identical. It also means that every OTA needs to patch this library. Remove __DATE__ and __TIME__ from the trace build info, just record whether it's a debug or release build. Bug: 24204119 Change-Id: I0dfc1479f096197007db1920b89aeb61ea537168 (cherry picked from commit e3422c11696e715e66b1669230410f098bf4c038)
-rw-r--r--src/system_wrappers/source/trace_posix.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/system_wrappers/source/trace_posix.cc b/src/system_wrappers/source/trace_posix.cc
index 1b8dd934d2..18045ca426 100644
--- a/src/system_wrappers/source/trace_posix.cc
+++ b/src/system_wrappers/source/trace_posix.cc
@@ -33,8 +33,12 @@
#endif
#define BUILDTIME __TIME__
#define BUILDDATE __DATE__
+#ifdef __ANDROID__
+#define BUILDINFO BUILDMODE
+#else
// example: "Oct 10 2002 12:05:30 r"
#define BUILDINFO BUILDDATE " " BUILDTIME " " BUILDMODE
+#endif
namespace webrtc {
TracePosix::TracePosix()