commit ca755f7ebfb2ba66ed9d61a7f0020e07727f1333
author Android Chromium Automerger <chromium-automerger@android> Mon Dec 02 22:03:58 2013 +0000
committer Android Chromium Automerger <chromium-automerger@android> Mon Dec 02 22:03:58 2013 +0000
tree 83cd31f1b048d83a7b36b735666fc28eaa794fd9
parent 5a301d9de3dbf5d927b7bb15363bb197e8078c90

Update makefiles after merge of Chromium at 238197

This commit was generated by merge_from_chromium.py.

Change-Id: If9e8116fd5928381254daa9bd5926cd5320e3640

openssl.target.darwin-arm.mk

diff --git a/openssl.target.darwin-arm.mk b/openssl.target.darwin-arm.mk
index 6cab1fd..ba1f682 100644
--- a/openssl.target.darwin-arm.mk
+++ b/openssl.target.darwin-arm.mk
@@ -636,6 +636,7 @@
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DNO_WINDOWS_BRAINDEATH' \
 	'-DPURIFY' \
@@ -736,6 +737,7 @@
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DNO_WINDOWS_BRAINDEATH' \
 	'-DPURIFY' \

openssl.target.darwin-mips.mk

diff --git a/openssl.target.darwin-mips.mk b/openssl.target.darwin-mips.mk
index 7e5f6bb..95cc17b 100644
--- a/openssl.target.darwin-mips.mk
+++ b/openssl.target.darwin-mips.mk
@@ -630,6 +630,7 @@
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DNO_WINDOWS_BRAINDEATH' \
 	'-DPURIFY' \
@@ -727,6 +728,7 @@
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DNO_WINDOWS_BRAINDEATH' \
 	'-DPURIFY' \

openssl.target.darwin-x86.mk

diff --git a/openssl.target.darwin-x86.mk b/openssl.target.darwin-x86.mk
index 03d6d27..dc66049 100644
--- a/openssl.target.darwin-x86.mk
+++ b/openssl.target.darwin-x86.mk
@@ -638,6 +638,7 @@
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DNO_WINDOWS_BRAINDEATH' \
 	'-DPURIFY' \
@@ -747,6 +748,7 @@
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DNO_WINDOWS_BRAINDEATH' \
 	'-DPURIFY' \

openssl.target.linux-arm.mk

diff --git a/openssl.target.linux-arm.mk b/openssl.target.linux-arm.mk
index 6cab1fd..ba1f682 100644
--- a/openssl.target.linux-arm.mk
+++ b/openssl.target.linux-arm.mk
@@ -636,6 +636,7 @@
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DNO_WINDOWS_BRAINDEATH' \
 	'-DPURIFY' \
@@ -736,6 +737,7 @@
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DNO_WINDOWS_BRAINDEATH' \
 	'-DPURIFY' \

openssl.target.linux-mips.mk

diff --git a/openssl.target.linux-mips.mk b/openssl.target.linux-mips.mk
index 7e5f6bb..95cc17b 100644
--- a/openssl.target.linux-mips.mk
+++ b/openssl.target.linux-mips.mk
@@ -630,6 +630,7 @@
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DNO_WINDOWS_BRAINDEATH' \
 	'-DPURIFY' \
@@ -727,6 +728,7 @@
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DNO_WINDOWS_BRAINDEATH' \
 	'-DPURIFY' \

openssl.target.linux-x86.mk

diff --git a/openssl.target.linux-x86.mk b/openssl.target.linux-x86.mk
index 03d6d27..dc66049 100644
--- a/openssl.target.linux-x86.mk
+++ b/openssl.target.linux-x86.mk
@@ -638,6 +638,7 @@
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DNO_WINDOWS_BRAINDEATH' \
 	'-DPURIFY' \
@@ -747,6 +748,7 @@
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DNO_WINDOWS_BRAINDEATH' \
 	'-DPURIFY' \