Merge tag 'android-6.0.1_r3' into 601r3
Android 6.0.1 release 3
* tag 'android-6.0.1_r3':
Remove ENABLE_TIMESTAMPS to ensure reproducible builds.
Change-Id: If8fdfc8235083a8e54aba72953f7c95753e5adb7
diff --git a/device/include/llvm/Config/config.h b/device/include/llvm/Config/config.h
index ac58972..d63e022 100644
--- a/device/include/llvm/Config/config.h
+++ b/device/include/llvm/Config/config.h
@@ -20,7 +20,7 @@
#define ENABLE_PIC 1
/* Define if timestamp information (e.g., __DATE___) is allowed */
-#define ENABLE_TIMESTAMPS 1
+/* #undef ENABLE_TIMESTAMPS */
/* Directory where gcc is installed. */
#define GCC_INSTALL_PREFIX ""
diff --git a/host/include/llvm/Config/config.h b/host/include/llvm/Config/config.h
index cb3d4a3..cb9d87a 100644
--- a/host/include/llvm/Config/config.h
+++ b/host/include/llvm/Config/config.h
@@ -20,7 +20,7 @@
#define ENABLE_PIC 1
/* Define if timestamp information (e.g., __DATE___) is allowed */
-#define ENABLE_TIMESTAMPS 1
+/* #undef ENABLE_TIMESTAMPS */
/* Directory where gcc is installed. */
#define GCC_INSTALL_PREFIX ""