commit c73f73c2b82040f5cef1f645480992edf1b32dc9
author Android Chromium Automerger <chromium-automerger@android> Thu Nov 07 17:11:33 2013 +0000
committer Android Chromium Automerger <chromium-automerger@android> Thu Nov 07 17:11:33 2013 +0000
tree 14ac1a2306daac1579501758f76a06daac770eed
parent a7ade8160e3045a8193b00e1a21dcfaadaf862d8

Update makefiles after merge of Chromium at 233627

This commit was generated by merge_from_chromium.py.

Change-Id: Ice2864a861385b77818abcfe16b256a4a01c19ca

ots.target.darwin-arm.mk

diff --git a/ots.target.darwin-arm.mk b/ots.target.darwin-arm.mk
index 70806a6..0cd378c 100644
--- a/ots.target.darwin-arm.mk
+++ b/ots.target.darwin-arm.mk
@@ -90,7 +90,6 @@
 
 MY_DEFS_Debug := \
 	'-DANGLE_DX11' \
-	'-DWebKit=blink' \
 	'-D_FILE_OFFSET_BITS=64' \
 	'-DNO_TCMALLOC' \
 	'-DDISABLE_NACL' \
@@ -173,7 +172,6 @@
 
 MY_DEFS_Release := \
 	'-DANGLE_DX11' \
-	'-DWebKit=blink' \
 	'-D_FILE_OFFSET_BITS=64' \
 	'-DNO_TCMALLOC' \
 	'-DDISABLE_NACL' \

ots.target.darwin-mips.mk

diff --git a/ots.target.darwin-mips.mk b/ots.target.darwin-mips.mk
index db77a3f..a58aaf9 100644
--- a/ots.target.darwin-mips.mk
+++ b/ots.target.darwin-mips.mk
@@ -89,7 +89,6 @@
 
 MY_DEFS_Debug := \
 	'-DANGLE_DX11' \
-	'-DWebKit=blink' \
 	'-D_FILE_OFFSET_BITS=64' \
 	'-DNO_TCMALLOC' \
 	'-DDISABLE_NACL' \
@@ -171,7 +170,6 @@
 
 MY_DEFS_Release := \
 	'-DANGLE_DX11' \
-	'-DWebKit=blink' \
 	'-D_FILE_OFFSET_BITS=64' \
 	'-DNO_TCMALLOC' \
 	'-DDISABLE_NACL' \

ots.target.darwin-x86.mk

diff --git a/ots.target.darwin-x86.mk b/ots.target.darwin-x86.mk
index 7f042ad..09aa815 100644
--- a/ots.target.darwin-x86.mk
+++ b/ots.target.darwin-x86.mk
@@ -92,7 +92,6 @@
 
 MY_DEFS_Debug := \
 	'-DANGLE_DX11' \
-	'-DWebKit=blink' \
 	'-D_FILE_OFFSET_BITS=64' \
 	'-DNO_TCMALLOC' \
 	'-DDISABLE_NACL' \
@@ -178,7 +177,6 @@
 
 MY_DEFS_Release := \
 	'-DANGLE_DX11' \
-	'-DWebKit=blink' \
 	'-D_FILE_OFFSET_BITS=64' \
 	'-DNO_TCMALLOC' \
 	'-DDISABLE_NACL' \

ots.target.linux-arm.mk

diff --git a/ots.target.linux-arm.mk b/ots.target.linux-arm.mk
index 70806a6..0cd378c 100644
--- a/ots.target.linux-arm.mk
+++ b/ots.target.linux-arm.mk
@@ -90,7 +90,6 @@
 
 MY_DEFS_Debug := \
 	'-DANGLE_DX11' \
-	'-DWebKit=blink' \
 	'-D_FILE_OFFSET_BITS=64' \
 	'-DNO_TCMALLOC' \
 	'-DDISABLE_NACL' \
@@ -173,7 +172,6 @@
 
 MY_DEFS_Release := \
 	'-DANGLE_DX11' \
-	'-DWebKit=blink' \
 	'-D_FILE_OFFSET_BITS=64' \
 	'-DNO_TCMALLOC' \
 	'-DDISABLE_NACL' \

ots.target.linux-mips.mk

diff --git a/ots.target.linux-mips.mk b/ots.target.linux-mips.mk
index db77a3f..a58aaf9 100644
--- a/ots.target.linux-mips.mk
+++ b/ots.target.linux-mips.mk
@@ -89,7 +89,6 @@
 
 MY_DEFS_Debug := \
 	'-DANGLE_DX11' \
-	'-DWebKit=blink' \
 	'-D_FILE_OFFSET_BITS=64' \
 	'-DNO_TCMALLOC' \
 	'-DDISABLE_NACL' \
@@ -171,7 +170,6 @@
 
 MY_DEFS_Release := \
 	'-DANGLE_DX11' \
-	'-DWebKit=blink' \
 	'-D_FILE_OFFSET_BITS=64' \
 	'-DNO_TCMALLOC' \
 	'-DDISABLE_NACL' \

ots.target.linux-x86.mk

diff --git a/ots.target.linux-x86.mk b/ots.target.linux-x86.mk
index 7f042ad..09aa815 100644
--- a/ots.target.linux-x86.mk
+++ b/ots.target.linux-x86.mk
@@ -92,7 +92,6 @@
 
 MY_DEFS_Debug := \
 	'-DANGLE_DX11' \
-	'-DWebKit=blink' \
 	'-D_FILE_OFFSET_BITS=64' \
 	'-DNO_TCMALLOC' \
 	'-DDISABLE_NACL' \
@@ -178,7 +177,6 @@
 
 MY_DEFS_Release := \
 	'-DANGLE_DX11' \
-	'-DWebKit=blink' \
 	'-D_FILE_OFFSET_BITS=64' \
 	'-DNO_TCMALLOC' \
 	'-DDISABLE_NACL' \