commit c454919f233e10231c46251b826a2448be554afe
author The Android Automerger <android-build@google.com> Tue Sep 17 21:11:07 2013 -0700
committer The Android Automerger <android-build@google.com> Tue Sep 17 21:11:07 2013 -0700
tree 2fb568a2f0919008fcea2294ecbfd432f45f60da
parent 7a44eafdb774e81e4a74d48601fbc0d1ddaf8008
parent d5e92b4ebf474a5ae84cf362e17164845d9d4987

merge in klp-release history after reset to klp-dev

ots.target.darwin-arm.mk

diff --git a/ots.target.darwin-arm.mk b/ots.target.darwin-arm.mk
index b81a2fc..6d2b303 100644
--- a/ots.target.darwin-arm.mk
+++ b/ots.target.darwin-arm.mk
@@ -99,6 +99,8 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
+	'-DLOGGING_IS_OFFICIAL_BUILD=1' \
+	'-DTRACING_IS_OFFICIAL_BUILD=1' \
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
@@ -182,6 +184,8 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
+	'-DLOGGING_IS_OFFICIAL_BUILD=1' \
+	'-DTRACING_IS_OFFICIAL_BUILD=1' \
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \

ots.target.darwin-mips.mk

diff --git a/ots.target.darwin-mips.mk b/ots.target.darwin-mips.mk
index 2ffc920..6eac549 100644
--- a/ots.target.darwin-mips.mk
+++ b/ots.target.darwin-mips.mk
@@ -98,6 +98,8 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
+	'-DLOGGING_IS_OFFICIAL_BUILD=1' \
+	'-DTRACING_IS_OFFICIAL_BUILD=1' \
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
@@ -180,6 +182,8 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
+	'-DLOGGING_IS_OFFICIAL_BUILD=1' \
+	'-DTRACING_IS_OFFICIAL_BUILD=1' \
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \

ots.target.darwin-x86.mk

diff --git a/ots.target.darwin-x86.mk b/ots.target.darwin-x86.mk
index 29c1bb6..ac8c40d 100644
--- a/ots.target.darwin-x86.mk
+++ b/ots.target.darwin-x86.mk
@@ -101,6 +101,8 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
+	'-DLOGGING_IS_OFFICIAL_BUILD=1' \
+	'-DTRACING_IS_OFFICIAL_BUILD=1' \
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
@@ -187,6 +189,8 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
+	'-DLOGGING_IS_OFFICIAL_BUILD=1' \
+	'-DTRACING_IS_OFFICIAL_BUILD=1' \
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \

ots.target.linux-arm.mk

diff --git a/ots.target.linux-arm.mk b/ots.target.linux-arm.mk
index b81a2fc..6d2b303 100644
--- a/ots.target.linux-arm.mk
+++ b/ots.target.linux-arm.mk
@@ -99,6 +99,8 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
+	'-DLOGGING_IS_OFFICIAL_BUILD=1' \
+	'-DTRACING_IS_OFFICIAL_BUILD=1' \
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
@@ -182,6 +184,8 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
+	'-DLOGGING_IS_OFFICIAL_BUILD=1' \
+	'-DTRACING_IS_OFFICIAL_BUILD=1' \
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \

ots.target.linux-mips.mk

diff --git a/ots.target.linux-mips.mk b/ots.target.linux-mips.mk
index 2ffc920..6eac549 100644
--- a/ots.target.linux-mips.mk
+++ b/ots.target.linux-mips.mk
@@ -98,6 +98,8 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
+	'-DLOGGING_IS_OFFICIAL_BUILD=1' \
+	'-DTRACING_IS_OFFICIAL_BUILD=1' \
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
@@ -180,6 +182,8 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
+	'-DLOGGING_IS_OFFICIAL_BUILD=1' \
+	'-DTRACING_IS_OFFICIAL_BUILD=1' \
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \

ots.target.linux-x86.mk

diff --git a/ots.target.linux-x86.mk b/ots.target.linux-x86.mk
index 29c1bb6..ac8c40d 100644
--- a/ots.target.linux-x86.mk
+++ b/ots.target.linux-x86.mk
@@ -101,6 +101,8 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
+	'-DLOGGING_IS_OFFICIAL_BUILD=1' \
+	'-DTRACING_IS_OFFICIAL_BUILD=1' \
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
@@ -187,6 +189,8 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
+	'-DLOGGING_IS_OFFICIAL_BUILD=1' \
+	'-DTRACING_IS_OFFICIAL_BUILD=1' \
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \