Merge tag 'android-6.0.1_r3' into 601r3
Android 6.0.1 release 3
* tag 'android-6.0.1_r3':
Remove __DATE__ and __TIME__ from tracing
Change-Id: I1d54f05f34e8b9c313813619ce14f62e61cb7f9d
diff --git a/src/system_wrappers/source/trace_posix.cc b/src/system_wrappers/source/trace_posix.cc
index 1b8dd93..18045ca 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()