commit 83b273e50024269815f11c2d79b7dc7870aac683
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 003c670103810629d3d2d93addb88870d7558d3c
parent cfbe45bfe61ea2c104daac787a2690d579814a50
parent f0931fc52dcaa9c0ed63869b614bd5c6c6f6ad10

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

openssl.target.darwin-arm.mk

diff --git a/openssl.target.darwin-arm.mk b/openssl.target.darwin-arm.mk
index fdf1b7b..2af5efb 100644
--- a/openssl.target.darwin-arm.mk
+++ b/openssl.target.darwin-arm.mk
@@ -625,6 +625,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' \
@@ -724,6 +726,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' \

openssl.target.darwin-mips.mk

diff --git a/openssl.target.darwin-mips.mk b/openssl.target.darwin-mips.mk
index b66b58c..30bc4f4 100644
--- a/openssl.target.darwin-mips.mk
+++ b/openssl.target.darwin-mips.mk
@@ -622,6 +622,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' \
@@ -718,6 +720,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' \

openssl.target.darwin-x86.mk

diff --git a/openssl.target.darwin-x86.mk b/openssl.target.darwin-x86.mk
index 5c79010..8cff846 100644
--- a/openssl.target.darwin-x86.mk
+++ b/openssl.target.darwin-x86.mk
@@ -630,6 +630,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' \
@@ -738,6 +740,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' \

openssl.target.linux-arm.mk

diff --git a/openssl.target.linux-arm.mk b/openssl.target.linux-arm.mk
index fdf1b7b..2af5efb 100644
--- a/openssl.target.linux-arm.mk
+++ b/openssl.target.linux-arm.mk
@@ -625,6 +625,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' \
@@ -724,6 +726,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' \

openssl.target.linux-mips.mk

diff --git a/openssl.target.linux-mips.mk b/openssl.target.linux-mips.mk
index b66b58c..30bc4f4 100644
--- a/openssl.target.linux-mips.mk
+++ b/openssl.target.linux-mips.mk
@@ -622,6 +622,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' \
@@ -718,6 +720,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' \

openssl.target.linux-x86.mk

diff --git a/openssl.target.linux-x86.mk b/openssl.target.linux-x86.mk
index 5c79010..8cff846 100644
--- a/openssl.target.linux-x86.mk
+++ b/openssl.target.linux-x86.mk
@@ -630,6 +630,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' \
@@ -738,6 +740,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' \