commit 955364101ab8d8ce27f9efa0c839f18fe92da7d9
author Android Chromium Automerger <chromium-automerger@android> Thu Nov 07 17:11:32 2013 +0000
committer Android Chromium Automerger <chromium-automerger@android> Thu Nov 07 17:11:32 2013 +0000
tree 2b8fbd3d54815034c3cb558ad2f44390c7e6e015
parent 0a92d040eb99455c89ff86c10c77dacc9741f160

Update makefiles after merge of Chromium at 233627

This commit was generated by merge_from_chromium.py.

Change-Id: If2d8965ba794c8a693dae2d5c9234024c331f4d7

openssl.target.darwin-arm.mk

diff --git a/openssl.target.darwin-arm.mk b/openssl.target.darwin-arm.mk
index 5f2659e..163c72c 100644
--- a/openssl.target.darwin-arm.mk
+++ b/openssl.target.darwin-arm.mk
@@ -616,7 +616,6 @@
 
 MY_DEFS_Debug := \
 	'-DANGLE_DX11' \
-	'-DWebKit=blink' \
 	'-D_FILE_OFFSET_BITS=64' \
 	'-DNO_TCMALLOC' \
 	'-DDISABLE_NACL' \
@@ -715,7 +714,6 @@
 
 MY_DEFS_Release := \
 	'-DANGLE_DX11' \
-	'-DWebKit=blink' \
 	'-D_FILE_OFFSET_BITS=64' \
 	'-DNO_TCMALLOC' \
 	'-DDISABLE_NACL' \

openssl.target.darwin-mips.mk

diff --git a/openssl.target.darwin-mips.mk b/openssl.target.darwin-mips.mk
index cf2cb21..1589f13 100644
--- a/openssl.target.darwin-mips.mk
+++ b/openssl.target.darwin-mips.mk
@@ -613,7 +613,6 @@
 
 MY_DEFS_Debug := \
 	'-DANGLE_DX11' \
-	'-DWebKit=blink' \
 	'-D_FILE_OFFSET_BITS=64' \
 	'-DNO_TCMALLOC' \
 	'-DDISABLE_NACL' \
@@ -709,7 +708,6 @@
 
 MY_DEFS_Release := \
 	'-DANGLE_DX11' \
-	'-DWebKit=blink' \
 	'-D_FILE_OFFSET_BITS=64' \
 	'-DNO_TCMALLOC' \
 	'-DDISABLE_NACL' \

openssl.target.darwin-x86.mk

diff --git a/openssl.target.darwin-x86.mk b/openssl.target.darwin-x86.mk
index 226ce39..845a045 100644
--- a/openssl.target.darwin-x86.mk
+++ b/openssl.target.darwin-x86.mk
@@ -621,7 +621,6 @@
 
 MY_DEFS_Debug := \
 	'-DANGLE_DX11' \
-	'-DWebKit=blink' \
 	'-D_FILE_OFFSET_BITS=64' \
 	'-DNO_TCMALLOC' \
 	'-DDISABLE_NACL' \
@@ -729,7 +728,6 @@
 
 MY_DEFS_Release := \
 	'-DANGLE_DX11' \
-	'-DWebKit=blink' \
 	'-D_FILE_OFFSET_BITS=64' \
 	'-DNO_TCMALLOC' \
 	'-DDISABLE_NACL' \

openssl.target.linux-arm.mk

diff --git a/openssl.target.linux-arm.mk b/openssl.target.linux-arm.mk
index 5f2659e..163c72c 100644
--- a/openssl.target.linux-arm.mk
+++ b/openssl.target.linux-arm.mk
@@ -616,7 +616,6 @@
 
 MY_DEFS_Debug := \
 	'-DANGLE_DX11' \
-	'-DWebKit=blink' \
 	'-D_FILE_OFFSET_BITS=64' \
 	'-DNO_TCMALLOC' \
 	'-DDISABLE_NACL' \
@@ -715,7 +714,6 @@
 
 MY_DEFS_Release := \
 	'-DANGLE_DX11' \
-	'-DWebKit=blink' \
 	'-D_FILE_OFFSET_BITS=64' \
 	'-DNO_TCMALLOC' \
 	'-DDISABLE_NACL' \

openssl.target.linux-mips.mk

diff --git a/openssl.target.linux-mips.mk b/openssl.target.linux-mips.mk
index cf2cb21..1589f13 100644
--- a/openssl.target.linux-mips.mk
+++ b/openssl.target.linux-mips.mk
@@ -613,7 +613,6 @@
 
 MY_DEFS_Debug := \
 	'-DANGLE_DX11' \
-	'-DWebKit=blink' \
 	'-D_FILE_OFFSET_BITS=64' \
 	'-DNO_TCMALLOC' \
 	'-DDISABLE_NACL' \
@@ -709,7 +708,6 @@
 
 MY_DEFS_Release := \
 	'-DANGLE_DX11' \
-	'-DWebKit=blink' \
 	'-D_FILE_OFFSET_BITS=64' \
 	'-DNO_TCMALLOC' \
 	'-DDISABLE_NACL' \

openssl.target.linux-x86.mk

diff --git a/openssl.target.linux-x86.mk b/openssl.target.linux-x86.mk
index 226ce39..845a045 100644
--- a/openssl.target.linux-x86.mk
+++ b/openssl.target.linux-x86.mk
@@ -621,7 +621,6 @@
 
 MY_DEFS_Debug := \
 	'-DANGLE_DX11' \
-	'-DWebKit=blink' \
 	'-D_FILE_OFFSET_BITS=64' \
 	'-DNO_TCMALLOC' \
 	'-DDISABLE_NACL' \
@@ -729,7 +728,6 @@
 
 MY_DEFS_Release := \
 	'-DANGLE_DX11' \
-	'-DWebKit=blink' \
 	'-D_FILE_OFFSET_BITS=64' \
 	'-DNO_TCMALLOC' \
 	'-DDISABLE_NACL' \