Update makefiles after merge of Chromium at 233627
This commit was generated by merge_from_chromium.py.
Change-Id: I03b2139d9c825449c0bed183150b9cce903b66b2
diff --git a/icudata.host.darwin-arm.mk b/icudata.host.darwin-arm.mk
index f11dc37..3c16731 100644
--- a/icudata.host.darwin-arm.mk
+++ b/icudata.host.darwin-arm.mk
@@ -49,7 +49,6 @@
MY_DEFS_Debug := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
- '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
@@ -106,7 +105,6 @@
MY_DEFS_Release := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
- '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
diff --git a/icudata.host.darwin-mips.mk b/icudata.host.darwin-mips.mk
index ceff426..2023af3 100644
--- a/icudata.host.darwin-mips.mk
+++ b/icudata.host.darwin-mips.mk
@@ -50,7 +50,6 @@
MY_DEFS_Debug := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
- '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
@@ -108,7 +107,6 @@
MY_DEFS_Release := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
- '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
diff --git a/icudata.host.darwin-x86.mk b/icudata.host.darwin-x86.mk
index 7797ca5..d0a7ea8 100644
--- a/icudata.host.darwin-x86.mk
+++ b/icudata.host.darwin-x86.mk
@@ -49,7 +49,6 @@
MY_DEFS_Debug := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
- '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
@@ -108,7 +107,6 @@
MY_DEFS_Release := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
- '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
diff --git a/icudata.host.linux-arm.mk b/icudata.host.linux-arm.mk
index 275dc74..2994c9e 100644
--- a/icudata.host.linux-arm.mk
+++ b/icudata.host.linux-arm.mk
@@ -49,7 +49,6 @@
MY_DEFS_Debug := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
- '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
@@ -106,7 +105,6 @@
MY_DEFS_Release := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
- '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
diff --git a/icudata.host.linux-mips.mk b/icudata.host.linux-mips.mk
index 5115053..8b6c0b1 100644
--- a/icudata.host.linux-mips.mk
+++ b/icudata.host.linux-mips.mk
@@ -50,7 +50,6 @@
MY_DEFS_Debug := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
- '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
@@ -108,7 +107,6 @@
MY_DEFS_Release := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
- '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
diff --git a/icudata.host.linux-x86.mk b/icudata.host.linux-x86.mk
index 34df3aa..96b4bde 100644
--- a/icudata.host.linux-x86.mk
+++ b/icudata.host.linux-x86.mk
@@ -49,7 +49,6 @@
MY_DEFS_Debug := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
- '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
@@ -108,7 +107,6 @@
MY_DEFS_Release := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
- '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
diff --git a/icui18n.host.darwin-arm.mk b/icui18n.host.darwin-arm.mk
index 7fbda30..0f8ef99 100644
--- a/icui18n.host.darwin-arm.mk
+++ b/icui18n.host.darwin-arm.mk
@@ -198,7 +198,6 @@
MY_DEFS_Debug := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
- '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
@@ -258,7 +257,6 @@
MY_DEFS_Release := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
- '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
diff --git a/icui18n.host.darwin-mips.mk b/icui18n.host.darwin-mips.mk
index fdfb4a0..9b99480 100644
--- a/icui18n.host.darwin-mips.mk
+++ b/icui18n.host.darwin-mips.mk
@@ -199,7 +199,6 @@
MY_DEFS_Debug := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
- '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
@@ -260,7 +259,6 @@
MY_DEFS_Release := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
- '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
diff --git a/icui18n.host.darwin-x86.mk b/icui18n.host.darwin-x86.mk
index 3d1efff..4becd83 100644
--- a/icui18n.host.darwin-x86.mk
+++ b/icui18n.host.darwin-x86.mk
@@ -198,7 +198,6 @@
MY_DEFS_Debug := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
- '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
@@ -260,7 +259,6 @@
MY_DEFS_Release := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
- '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
diff --git a/icui18n.host.linux-arm.mk b/icui18n.host.linux-arm.mk
index 83d3ea7..f37670a 100644
--- a/icui18n.host.linux-arm.mk
+++ b/icui18n.host.linux-arm.mk
@@ -198,7 +198,6 @@
MY_DEFS_Debug := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
- '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
@@ -258,7 +257,6 @@
MY_DEFS_Release := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
- '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
diff --git a/icui18n.host.linux-mips.mk b/icui18n.host.linux-mips.mk
index 33f9538..fc07504 100644
--- a/icui18n.host.linux-mips.mk
+++ b/icui18n.host.linux-mips.mk
@@ -199,7 +199,6 @@
MY_DEFS_Debug := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
- '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
@@ -260,7 +259,6 @@
MY_DEFS_Release := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
- '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
diff --git a/icui18n.host.linux-x86.mk b/icui18n.host.linux-x86.mk
index d7e95a6..ba88ddb 100644
--- a/icui18n.host.linux-x86.mk
+++ b/icui18n.host.linux-x86.mk
@@ -198,7 +198,6 @@
MY_DEFS_Debug := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
- '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
@@ -260,7 +259,6 @@
MY_DEFS_Release := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
- '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
diff --git a/icuuc.host.darwin-arm.mk b/icuuc.host.darwin-arm.mk
index d37952e..d31ad5e 100644
--- a/icuuc.host.darwin-arm.mk
+++ b/icuuc.host.darwin-arm.mk
@@ -203,7 +203,6 @@
MY_DEFS_Debug := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
- '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
@@ -263,7 +262,6 @@
MY_DEFS_Release := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
- '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
diff --git a/icuuc.host.darwin-mips.mk b/icuuc.host.darwin-mips.mk
index 3a2b238..246af12 100644
--- a/icuuc.host.darwin-mips.mk
+++ b/icuuc.host.darwin-mips.mk
@@ -204,7 +204,6 @@
MY_DEFS_Debug := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
- '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
@@ -265,7 +264,6 @@
MY_DEFS_Release := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
- '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
diff --git a/icuuc.host.darwin-x86.mk b/icuuc.host.darwin-x86.mk
index a23dce7..3ab72c6 100644
--- a/icuuc.host.darwin-x86.mk
+++ b/icuuc.host.darwin-x86.mk
@@ -203,7 +203,6 @@
MY_DEFS_Debug := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
- '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
@@ -265,7 +264,6 @@
MY_DEFS_Release := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
- '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
diff --git a/icuuc.host.linux-arm.mk b/icuuc.host.linux-arm.mk
index cb7ea07..0ec7e15 100644
--- a/icuuc.host.linux-arm.mk
+++ b/icuuc.host.linux-arm.mk
@@ -203,7 +203,6 @@
MY_DEFS_Debug := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
- '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
@@ -263,7 +262,6 @@
MY_DEFS_Release := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
- '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
diff --git a/icuuc.host.linux-mips.mk b/icuuc.host.linux-mips.mk
index 4828caf..56b445d 100644
--- a/icuuc.host.linux-mips.mk
+++ b/icuuc.host.linux-mips.mk
@@ -204,7 +204,6 @@
MY_DEFS_Debug := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
- '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
@@ -265,7 +264,6 @@
MY_DEFS_Release := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
- '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
diff --git a/icuuc.host.linux-x86.mk b/icuuc.host.linux-x86.mk
index b6aa587..1965b59 100644
--- a/icuuc.host.linux-x86.mk
+++ b/icuuc.host.linux-x86.mk
@@ -203,7 +203,6 @@
MY_DEFS_Debug := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
- '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
@@ -265,7 +264,6 @@
MY_DEFS_Release := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
- '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
