commit 73d29a64d6cac70e0e933673661b613ba9868006
author Android Chromium Automerger <chromium-automerger@android> Thu Mar 21 04:03:58 2013 +0000
committer Android Chromium Automerger <chromium-automerger@android> Thu Mar 21 04:03:58 2013 +0000
tree 5866dd50f7fbc201a5794920a02feeee7e247a5a
parent 4f0983196135b09d18d0f75e206d87f43cf113f9

Update makefiles after merge of Chromium at r189518

This commit was generated by merge_from_chromium.py.

Change-Id: I1a53201695f225e5b4595387118219a155266188

openssl.target.linux-arm.mk

diff --git a/openssl.target.linux-arm.mk b/openssl.target.linux-arm.mk
index 38a6b27..a019df8 100644
--- a/openssl.target.linux-arm.mk
+++ b/openssl.target.linux-arm.mk
@@ -623,7 +623,6 @@
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_PEPPER_THREADING' \
 	'-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 a468bf9..58b4fde 100644
--- a/openssl.target.linux-x86.mk
+++ b/openssl.target.linux-x86.mk
@@ -627,7 +627,6 @@
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_PEPPER_THREADING' \
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \