Update makefiles after merge of Chromium at 39.0.2171.26
This commit was generated by merge_from_chromium.py.
Change-Id: I6bddf4a79bc732a94deccdb1b45da90a57c63548
diff --git a/icudata.host.darwin-arm.mk b/icudata.host.darwin-arm.mk
index ef1aa63..2d4858a 100644
--- a/icudata.host.darwin-arm.mk
+++ b/icudata.host.darwin-arm.mk
@@ -196,6 +196,9 @@
LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := true
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_icudata_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
diff --git a/icudata.host.darwin-arm64.mk b/icudata.host.darwin-arm64.mk
index 15aa0d2..456d94f 100644
--- a/icudata.host.darwin-arm64.mk
+++ b/icudata.host.darwin-arm64.mk
@@ -194,6 +194,9 @@
LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := true
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_icudata_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
diff --git a/icudata.host.darwin-mips.mk b/icudata.host.darwin-mips.mk
index 9b4bcf3..892d662 100644
--- a/icudata.host.darwin-mips.mk
+++ b/icudata.host.darwin-mips.mk
@@ -198,6 +198,9 @@
LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := true
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_icudata_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
diff --git a/icudata.host.darwin-x86.mk b/icudata.host.darwin-x86.mk
index ef1aa63..2d4858a 100644
--- a/icudata.host.darwin-x86.mk
+++ b/icudata.host.darwin-x86.mk
@@ -196,6 +196,9 @@
LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := true
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_icudata_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
diff --git a/icudata.host.darwin-x86_64.mk b/icudata.host.darwin-x86_64.mk
index 98c6616..0e90aca 100644
--- a/icudata.host.darwin-x86_64.mk
+++ b/icudata.host.darwin-x86_64.mk
@@ -196,6 +196,9 @@
LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := true
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_icudata_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
diff --git a/icudata.host.linux-arm.mk b/icudata.host.linux-arm.mk
index 11d5620..a53935e 100644
--- a/icudata.host.linux-arm.mk
+++ b/icudata.host.linux-arm.mk
@@ -196,6 +196,9 @@
LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := true
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_icudata_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
diff --git a/icudata.host.linux-arm64.mk b/icudata.host.linux-arm64.mk
index 0ab6bde..147b52e 100644
--- a/icudata.host.linux-arm64.mk
+++ b/icudata.host.linux-arm64.mk
@@ -194,6 +194,9 @@
LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := true
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_icudata_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
diff --git a/icudata.host.linux-mips.mk b/icudata.host.linux-mips.mk
index 3fdbb91..7548c9d 100644
--- a/icudata.host.linux-mips.mk
+++ b/icudata.host.linux-mips.mk
@@ -198,6 +198,9 @@
LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := true
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_icudata_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
diff --git a/icudata.host.linux-x86.mk b/icudata.host.linux-x86.mk
index 11d5620..a53935e 100644
--- a/icudata.host.linux-x86.mk
+++ b/icudata.host.linux-x86.mk
@@ -196,6 +196,9 @@
LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := true
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_icudata_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
diff --git a/icudata.host.linux-x86_64.mk b/icudata.host.linux-x86_64.mk
index f55d474..55ca831 100644
--- a/icudata.host.linux-x86_64.mk
+++ b/icudata.host.linux-x86_64.mk
@@ -196,6 +196,9 @@
LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := true
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_icudata_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
diff --git a/icui18n.host.darwin-arm.mk b/icui18n.host.darwin-arm.mk
index 4f89d08..599842c 100644
--- a/icui18n.host.darwin-arm.mk
+++ b/icui18n.host.darwin-arm.mk
@@ -373,6 +373,9 @@
LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := true
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_icui18n_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
diff --git a/icui18n.host.darwin-arm64.mk b/icui18n.host.darwin-arm64.mk
index a64c964..bfb8e4a 100644
--- a/icui18n.host.darwin-arm64.mk
+++ b/icui18n.host.darwin-arm64.mk
@@ -371,6 +371,9 @@
LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := true
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_icui18n_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
diff --git a/icui18n.host.darwin-mips.mk b/icui18n.host.darwin-mips.mk
index 19255e4..bc3294f 100644
--- a/icui18n.host.darwin-mips.mk
+++ b/icui18n.host.darwin-mips.mk
@@ -375,6 +375,9 @@
LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := true
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_icui18n_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
diff --git a/icui18n.host.darwin-x86.mk b/icui18n.host.darwin-x86.mk
index 4f89d08..599842c 100644
--- a/icui18n.host.darwin-x86.mk
+++ b/icui18n.host.darwin-x86.mk
@@ -373,6 +373,9 @@
LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := true
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_icui18n_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
diff --git a/icui18n.host.darwin-x86_64.mk b/icui18n.host.darwin-x86_64.mk
index 0ca72a0..16ac1bd 100644
--- a/icui18n.host.darwin-x86_64.mk
+++ b/icui18n.host.darwin-x86_64.mk
@@ -373,6 +373,9 @@
LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := true
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_icui18n_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
diff --git a/icui18n.host.linux-arm.mk b/icui18n.host.linux-arm.mk
index 4f89d08..599842c 100644
--- a/icui18n.host.linux-arm.mk
+++ b/icui18n.host.linux-arm.mk
@@ -373,6 +373,9 @@
LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := true
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_icui18n_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
diff --git a/icui18n.host.linux-arm64.mk b/icui18n.host.linux-arm64.mk
index a64c964..bfb8e4a 100644
--- a/icui18n.host.linux-arm64.mk
+++ b/icui18n.host.linux-arm64.mk
@@ -371,6 +371,9 @@
LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := true
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_icui18n_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
diff --git a/icui18n.host.linux-mips.mk b/icui18n.host.linux-mips.mk
index 19255e4..bc3294f 100644
--- a/icui18n.host.linux-mips.mk
+++ b/icui18n.host.linux-mips.mk
@@ -375,6 +375,9 @@
LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := true
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_icui18n_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
diff --git a/icui18n.host.linux-x86.mk b/icui18n.host.linux-x86.mk
index 4f89d08..599842c 100644
--- a/icui18n.host.linux-x86.mk
+++ b/icui18n.host.linux-x86.mk
@@ -373,6 +373,9 @@
LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := true
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_icui18n_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
diff --git a/icui18n.host.linux-x86_64.mk b/icui18n.host.linux-x86_64.mk
index 0ca72a0..16ac1bd 100644
--- a/icui18n.host.linux-x86_64.mk
+++ b/icui18n.host.linux-x86_64.mk
@@ -373,6 +373,9 @@
LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := true
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_icui18n_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
diff --git a/icuuc.host.darwin-arm.mk b/icuuc.host.darwin-arm.mk
index f877835..f24acef 100644
--- a/icuuc.host.darwin-arm.mk
+++ b/icuuc.host.darwin-arm.mk
@@ -382,6 +382,9 @@
LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := true
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_icuuc_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
diff --git a/icuuc.host.darwin-arm64.mk b/icuuc.host.darwin-arm64.mk
index 14c33de..209a9d6 100644
--- a/icuuc.host.darwin-arm64.mk
+++ b/icuuc.host.darwin-arm64.mk
@@ -380,6 +380,9 @@
LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := true
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_icuuc_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
diff --git a/icuuc.host.darwin-mips.mk b/icuuc.host.darwin-mips.mk
index 9c2673f..e0837bb 100644
--- a/icuuc.host.darwin-mips.mk
+++ b/icuuc.host.darwin-mips.mk
@@ -384,6 +384,9 @@
LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := true
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_icuuc_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
diff --git a/icuuc.host.darwin-x86.mk b/icuuc.host.darwin-x86.mk
index f877835..f24acef 100644
--- a/icuuc.host.darwin-x86.mk
+++ b/icuuc.host.darwin-x86.mk
@@ -382,6 +382,9 @@
LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := true
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_icuuc_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
diff --git a/icuuc.host.darwin-x86_64.mk b/icuuc.host.darwin-x86_64.mk
index 613a76a..d92f5cf 100644
--- a/icuuc.host.darwin-x86_64.mk
+++ b/icuuc.host.darwin-x86_64.mk
@@ -382,6 +382,9 @@
LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := true
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_icuuc_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
diff --git a/icuuc.host.linux-arm.mk b/icuuc.host.linux-arm.mk
index f877835..f24acef 100644
--- a/icuuc.host.linux-arm.mk
+++ b/icuuc.host.linux-arm.mk
@@ -382,6 +382,9 @@
LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := true
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_icuuc_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
diff --git a/icuuc.host.linux-arm64.mk b/icuuc.host.linux-arm64.mk
index 14c33de..209a9d6 100644
--- a/icuuc.host.linux-arm64.mk
+++ b/icuuc.host.linux-arm64.mk
@@ -380,6 +380,9 @@
LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := true
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_icuuc_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
diff --git a/icuuc.host.linux-mips.mk b/icuuc.host.linux-mips.mk
index 9c2673f..e0837bb 100644
--- a/icuuc.host.linux-mips.mk
+++ b/icuuc.host.linux-mips.mk
@@ -384,6 +384,9 @@
LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := true
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_icuuc_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
diff --git a/icuuc.host.linux-x86.mk b/icuuc.host.linux-x86.mk
index f877835..f24acef 100644
--- a/icuuc.host.linux-x86.mk
+++ b/icuuc.host.linux-x86.mk
@@ -382,6 +382,9 @@
LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := true
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_icuuc_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
diff --git a/icuuc.host.linux-x86_64.mk b/icuuc.host.linux-x86_64.mk
index 613a76a..d92f5cf 100644
--- a/icuuc.host.linux-x86_64.mk
+++ b/icuuc.host.linux-x86_64.mk
@@ -382,6 +382,9 @@
LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := true
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_icuuc_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
