Update makefiles after merge of Chromium at r221681
This commit was generated by merge_from_chromium.py.
Change-Id: Id36f5d948b661d15d4e17edc63975ee517a507bd
diff --git a/icudata.host.darwin-arm.mk b/icudata.host.darwin-arm.mk
index 42648e0..0a7cf87 100644
--- a/icudata.host.darwin-arm.mk
+++ b/icudata.host.darwin-arm.mk
@@ -63,6 +63,7 @@
'-DENABLE_GPU=1' \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
+ '-DCLD_VERSION=1' \
'-DU_HIDE_DATA_SYMBOL' \
'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
@@ -120,6 +121,7 @@
'-DENABLE_GPU=1' \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
+ '-DCLD_VERSION=1' \
'-DU_HIDE_DATA_SYMBOL' \
'-DNDEBUG' \
'-DNVALGRIND' \
diff --git a/icudata.host.darwin-mips.mk b/icudata.host.darwin-mips.mk
index 2a66999..c87db33 100644
--- a/icudata.host.darwin-mips.mk
+++ b/icudata.host.darwin-mips.mk
@@ -64,6 +64,7 @@
'-DENABLE_GPU=1' \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
+ '-DCLD_VERSION=1' \
'-DU_HIDE_DATA_SYMBOL' \
'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
@@ -122,6 +123,7 @@
'-DENABLE_GPU=1' \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
+ '-DCLD_VERSION=1' \
'-DU_HIDE_DATA_SYMBOL' \
'-DNDEBUG' \
'-DNVALGRIND' \
diff --git a/icudata.host.darwin-x86.mk b/icudata.host.darwin-x86.mk
index c789891..12888ab 100644
--- a/icudata.host.darwin-x86.mk
+++ b/icudata.host.darwin-x86.mk
@@ -63,6 +63,7 @@
'-DENABLE_GPU=1' \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
+ '-DCLD_VERSION=1' \
'-DU_HIDE_DATA_SYMBOL' \
'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
@@ -122,6 +123,7 @@
'-DENABLE_GPU=1' \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
+ '-DCLD_VERSION=1' \
'-DU_HIDE_DATA_SYMBOL' \
'-DNDEBUG' \
'-DNVALGRIND' \
diff --git a/icudata.host.linux-arm.mk b/icudata.host.linux-arm.mk
index 1a5f70d..f03ab4e 100644
--- a/icudata.host.linux-arm.mk
+++ b/icudata.host.linux-arm.mk
@@ -63,6 +63,7 @@
'-DENABLE_GPU=1' \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
+ '-DCLD_VERSION=1' \
'-DU_HIDE_DATA_SYMBOL' \
'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
@@ -120,6 +121,7 @@
'-DENABLE_GPU=1' \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
+ '-DCLD_VERSION=1' \
'-DU_HIDE_DATA_SYMBOL' \
'-DNDEBUG' \
'-DNVALGRIND' \
diff --git a/icudata.host.linux-mips.mk b/icudata.host.linux-mips.mk
index 79efe4b..e90caa0 100644
--- a/icudata.host.linux-mips.mk
+++ b/icudata.host.linux-mips.mk
@@ -64,6 +64,7 @@
'-DENABLE_GPU=1' \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
+ '-DCLD_VERSION=1' \
'-DU_HIDE_DATA_SYMBOL' \
'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
@@ -122,6 +123,7 @@
'-DENABLE_GPU=1' \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
+ '-DCLD_VERSION=1' \
'-DU_HIDE_DATA_SYMBOL' \
'-DNDEBUG' \
'-DNVALGRIND' \
diff --git a/icudata.host.linux-x86.mk b/icudata.host.linux-x86.mk
index 97506f0..d8e018d 100644
--- a/icudata.host.linux-x86.mk
+++ b/icudata.host.linux-x86.mk
@@ -63,6 +63,7 @@
'-DENABLE_GPU=1' \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
+ '-DCLD_VERSION=1' \
'-DU_HIDE_DATA_SYMBOL' \
'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
@@ -122,6 +123,7 @@
'-DENABLE_GPU=1' \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
+ '-DCLD_VERSION=1' \
'-DU_HIDE_DATA_SYMBOL' \
'-DNDEBUG' \
'-DNVALGRIND' \
diff --git a/icui18n.host.darwin-arm.mk b/icui18n.host.darwin-arm.mk
index 9bfa77d..616409b 100644
--- a/icui18n.host.darwin-arm.mk
+++ b/icui18n.host.darwin-arm.mk
@@ -212,6 +212,7 @@
'-DENABLE_GPU=1' \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
+ '-DCLD_VERSION=1' \
'-DU_I18N_IMPLEMENTATION' \
'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
@@ -272,6 +273,7 @@
'-DENABLE_GPU=1' \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
+ '-DCLD_VERSION=1' \
'-DU_I18N_IMPLEMENTATION' \
'-DNDEBUG' \
'-DNVALGRIND' \
diff --git a/icui18n.host.darwin-mips.mk b/icui18n.host.darwin-mips.mk
index d18da71..1e171a9 100644
--- a/icui18n.host.darwin-mips.mk
+++ b/icui18n.host.darwin-mips.mk
@@ -213,6 +213,7 @@
'-DENABLE_GPU=1' \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
+ '-DCLD_VERSION=1' \
'-DU_I18N_IMPLEMENTATION' \
'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
@@ -274,6 +275,7 @@
'-DENABLE_GPU=1' \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
+ '-DCLD_VERSION=1' \
'-DU_I18N_IMPLEMENTATION' \
'-DNDEBUG' \
'-DNVALGRIND' \
diff --git a/icui18n.host.darwin-x86.mk b/icui18n.host.darwin-x86.mk
index 1bdd670..283414f 100644
--- a/icui18n.host.darwin-x86.mk
+++ b/icui18n.host.darwin-x86.mk
@@ -212,6 +212,7 @@
'-DENABLE_GPU=1' \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
+ '-DCLD_VERSION=1' \
'-DU_I18N_IMPLEMENTATION' \
'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
@@ -274,6 +275,7 @@
'-DENABLE_GPU=1' \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
+ '-DCLD_VERSION=1' \
'-DU_I18N_IMPLEMENTATION' \
'-DNDEBUG' \
'-DNVALGRIND' \
diff --git a/icui18n.host.linux-arm.mk b/icui18n.host.linux-arm.mk
index 0313e21..0cb1a7c 100644
--- a/icui18n.host.linux-arm.mk
+++ b/icui18n.host.linux-arm.mk
@@ -212,6 +212,7 @@
'-DENABLE_GPU=1' \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
+ '-DCLD_VERSION=1' \
'-DU_I18N_IMPLEMENTATION' \
'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
@@ -272,6 +273,7 @@
'-DENABLE_GPU=1' \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
+ '-DCLD_VERSION=1' \
'-DU_I18N_IMPLEMENTATION' \
'-DNDEBUG' \
'-DNVALGRIND' \
diff --git a/icui18n.host.linux-mips.mk b/icui18n.host.linux-mips.mk
index f35e0bb..3707b07 100644
--- a/icui18n.host.linux-mips.mk
+++ b/icui18n.host.linux-mips.mk
@@ -213,6 +213,7 @@
'-DENABLE_GPU=1' \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
+ '-DCLD_VERSION=1' \
'-DU_I18N_IMPLEMENTATION' \
'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
@@ -274,6 +275,7 @@
'-DENABLE_GPU=1' \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
+ '-DCLD_VERSION=1' \
'-DU_I18N_IMPLEMENTATION' \
'-DNDEBUG' \
'-DNVALGRIND' \
diff --git a/icui18n.host.linux-x86.mk b/icui18n.host.linux-x86.mk
index 0d11465..62a2907 100644
--- a/icui18n.host.linux-x86.mk
+++ b/icui18n.host.linux-x86.mk
@@ -212,6 +212,7 @@
'-DENABLE_GPU=1' \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
+ '-DCLD_VERSION=1' \
'-DU_I18N_IMPLEMENTATION' \
'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
@@ -274,6 +275,7 @@
'-DENABLE_GPU=1' \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
+ '-DCLD_VERSION=1' \
'-DU_I18N_IMPLEMENTATION' \
'-DNDEBUG' \
'-DNVALGRIND' \
diff --git a/icuuc.host.darwin-arm.mk b/icuuc.host.darwin-arm.mk
index 74a4ccb..1a342f2 100644
--- a/icuuc.host.darwin-arm.mk
+++ b/icuuc.host.darwin-arm.mk
@@ -217,6 +217,7 @@
'-DENABLE_GPU=1' \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
+ '-DCLD_VERSION=1' \
'-DU_COMMON_IMPLEMENTATION' \
'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
@@ -277,6 +278,7 @@
'-DENABLE_GPU=1' \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
+ '-DCLD_VERSION=1' \
'-DU_COMMON_IMPLEMENTATION' \
'-DNDEBUG' \
'-DNVALGRIND' \
diff --git a/icuuc.host.darwin-mips.mk b/icuuc.host.darwin-mips.mk
index 36a8747..a9a52bf 100644
--- a/icuuc.host.darwin-mips.mk
+++ b/icuuc.host.darwin-mips.mk
@@ -218,6 +218,7 @@
'-DENABLE_GPU=1' \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
+ '-DCLD_VERSION=1' \
'-DU_COMMON_IMPLEMENTATION' \
'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
@@ -279,6 +280,7 @@
'-DENABLE_GPU=1' \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
+ '-DCLD_VERSION=1' \
'-DU_COMMON_IMPLEMENTATION' \
'-DNDEBUG' \
'-DNVALGRIND' \
diff --git a/icuuc.host.darwin-x86.mk b/icuuc.host.darwin-x86.mk
index 9e09dff..675a138 100644
--- a/icuuc.host.darwin-x86.mk
+++ b/icuuc.host.darwin-x86.mk
@@ -217,6 +217,7 @@
'-DENABLE_GPU=1' \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
+ '-DCLD_VERSION=1' \
'-DU_COMMON_IMPLEMENTATION' \
'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
@@ -279,6 +280,7 @@
'-DENABLE_GPU=1' \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
+ '-DCLD_VERSION=1' \
'-DU_COMMON_IMPLEMENTATION' \
'-DNDEBUG' \
'-DNVALGRIND' \
diff --git a/icuuc.host.linux-arm.mk b/icuuc.host.linux-arm.mk
index 3e74b43..d0d2710 100644
--- a/icuuc.host.linux-arm.mk
+++ b/icuuc.host.linux-arm.mk
@@ -217,6 +217,7 @@
'-DENABLE_GPU=1' \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
+ '-DCLD_VERSION=1' \
'-DU_COMMON_IMPLEMENTATION' \
'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
@@ -277,6 +278,7 @@
'-DENABLE_GPU=1' \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
+ '-DCLD_VERSION=1' \
'-DU_COMMON_IMPLEMENTATION' \
'-DNDEBUG' \
'-DNVALGRIND' \
diff --git a/icuuc.host.linux-mips.mk b/icuuc.host.linux-mips.mk
index b62ca08..12132c1 100644
--- a/icuuc.host.linux-mips.mk
+++ b/icuuc.host.linux-mips.mk
@@ -218,6 +218,7 @@
'-DENABLE_GPU=1' \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
+ '-DCLD_VERSION=1' \
'-DU_COMMON_IMPLEMENTATION' \
'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
@@ -279,6 +280,7 @@
'-DENABLE_GPU=1' \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
+ '-DCLD_VERSION=1' \
'-DU_COMMON_IMPLEMENTATION' \
'-DNDEBUG' \
'-DNVALGRIND' \
diff --git a/icuuc.host.linux-x86.mk b/icuuc.host.linux-x86.mk
index 3a23fa9..a6bb72e 100644
--- a/icuuc.host.linux-x86.mk
+++ b/icuuc.host.linux-x86.mk
@@ -217,6 +217,7 @@
'-DENABLE_GPU=1' \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
+ '-DCLD_VERSION=1' \
'-DU_COMMON_IMPLEMENTATION' \
'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
@@ -279,6 +280,7 @@
'-DENABLE_GPU=1' \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
+ '-DCLD_VERSION=1' \
'-DU_COMMON_IMPLEMENTATION' \
'-DNDEBUG' \
'-DNVALGRIND' \
