Update makefiles after merge of Chromium at 6e9c84566c9f
This commit was generated by merge_from_chromium.py.
Change-Id: I77e9481fee8371d84d0a3655c61d66168228432e
diff --git a/icui18n.target.darwin-arm.mk b/icui18n.target.darwin-arm.mk
index bc6ee02..f930418 100644
--- a/icui18n.target.darwin-arm.mk
+++ b/icui18n.target.darwin-arm.mk
@@ -187,6 +187,9 @@
LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := false
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_icui18n_gyp
diff --git a/icui18n.target.darwin-arm64.mk b/icui18n.target.darwin-arm64.mk
index bc6ee02..f930418 100644
--- a/icui18n.target.darwin-arm64.mk
+++ b/icui18n.target.darwin-arm64.mk
@@ -187,6 +187,9 @@
LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := false
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_icui18n_gyp
diff --git a/icui18n.target.darwin-mips.mk b/icui18n.target.darwin-mips.mk
index bc6ee02..f930418 100644
--- a/icui18n.target.darwin-mips.mk
+++ b/icui18n.target.darwin-mips.mk
@@ -187,6 +187,9 @@
LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := false
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_icui18n_gyp
diff --git a/icui18n.target.darwin-x86.mk b/icui18n.target.darwin-x86.mk
index bc6ee02..f930418 100644
--- a/icui18n.target.darwin-x86.mk
+++ b/icui18n.target.darwin-x86.mk
@@ -187,6 +187,9 @@
LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := false
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_icui18n_gyp
diff --git a/icui18n.target.darwin-x86_64.mk b/icui18n.target.darwin-x86_64.mk
index bc6ee02..f930418 100644
--- a/icui18n.target.darwin-x86_64.mk
+++ b/icui18n.target.darwin-x86_64.mk
@@ -187,6 +187,9 @@
LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := false
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_icui18n_gyp
diff --git a/icui18n.target.linux-arm.mk b/icui18n.target.linux-arm.mk
index bc6ee02..f930418 100644
--- a/icui18n.target.linux-arm.mk
+++ b/icui18n.target.linux-arm.mk
@@ -187,6 +187,9 @@
LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := false
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_icui18n_gyp
diff --git a/icui18n.target.linux-arm64.mk b/icui18n.target.linux-arm64.mk
index bc6ee02..f930418 100644
--- a/icui18n.target.linux-arm64.mk
+++ b/icui18n.target.linux-arm64.mk
@@ -187,6 +187,9 @@
LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := false
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_icui18n_gyp
diff --git a/icui18n.target.linux-mips.mk b/icui18n.target.linux-mips.mk
index bc6ee02..f930418 100644
--- a/icui18n.target.linux-mips.mk
+++ b/icui18n.target.linux-mips.mk
@@ -187,6 +187,9 @@
LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := false
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_icui18n_gyp
diff --git a/icui18n.target.linux-x86.mk b/icui18n.target.linux-x86.mk
index bc6ee02..f930418 100644
--- a/icui18n.target.linux-x86.mk
+++ b/icui18n.target.linux-x86.mk
@@ -187,6 +187,9 @@
LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := false
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_icui18n_gyp
diff --git a/icui18n.target.linux-x86_64.mk b/icui18n.target.linux-x86_64.mk
index bc6ee02..f930418 100644
--- a/icui18n.target.linux-x86_64.mk
+++ b/icui18n.target.linux-x86_64.mk
@@ -187,6 +187,9 @@
LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := false
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_icui18n_gyp
diff --git a/icuuc.target.darwin-arm.mk b/icuuc.target.darwin-arm.mk
index 73fe286..7ab5455 100644
--- a/icuuc.target.darwin-arm.mk
+++ b/icuuc.target.darwin-arm.mk
@@ -199,6 +199,9 @@
LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := false
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_icuuc_gyp
diff --git a/icuuc.target.darwin-arm64.mk b/icuuc.target.darwin-arm64.mk
index 73fe286..7ab5455 100644
--- a/icuuc.target.darwin-arm64.mk
+++ b/icuuc.target.darwin-arm64.mk
@@ -199,6 +199,9 @@
LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := false
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_icuuc_gyp
diff --git a/icuuc.target.darwin-mips.mk b/icuuc.target.darwin-mips.mk
index 73fe286..7ab5455 100644
--- a/icuuc.target.darwin-mips.mk
+++ b/icuuc.target.darwin-mips.mk
@@ -199,6 +199,9 @@
LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := false
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_icuuc_gyp
diff --git a/icuuc.target.darwin-x86.mk b/icuuc.target.darwin-x86.mk
index 73fe286..7ab5455 100644
--- a/icuuc.target.darwin-x86.mk
+++ b/icuuc.target.darwin-x86.mk
@@ -199,6 +199,9 @@
LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := false
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_icuuc_gyp
diff --git a/icuuc.target.darwin-x86_64.mk b/icuuc.target.darwin-x86_64.mk
index 73fe286..7ab5455 100644
--- a/icuuc.target.darwin-x86_64.mk
+++ b/icuuc.target.darwin-x86_64.mk
@@ -199,6 +199,9 @@
LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := false
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_icuuc_gyp
diff --git a/icuuc.target.linux-arm.mk b/icuuc.target.linux-arm.mk
index 73fe286..7ab5455 100644
--- a/icuuc.target.linux-arm.mk
+++ b/icuuc.target.linux-arm.mk
@@ -199,6 +199,9 @@
LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := false
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_icuuc_gyp
diff --git a/icuuc.target.linux-arm64.mk b/icuuc.target.linux-arm64.mk
index 73fe286..7ab5455 100644
--- a/icuuc.target.linux-arm64.mk
+++ b/icuuc.target.linux-arm64.mk
@@ -199,6 +199,9 @@
LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := false
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_icuuc_gyp
diff --git a/icuuc.target.linux-mips.mk b/icuuc.target.linux-mips.mk
index 73fe286..7ab5455 100644
--- a/icuuc.target.linux-mips.mk
+++ b/icuuc.target.linux-mips.mk
@@ -199,6 +199,9 @@
LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := false
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_icuuc_gyp
diff --git a/icuuc.target.linux-x86.mk b/icuuc.target.linux-x86.mk
index 73fe286..7ab5455 100644
--- a/icuuc.target.linux-x86.mk
+++ b/icuuc.target.linux-x86.mk
@@ -199,6 +199,9 @@
LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := false
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_icuuc_gyp
diff --git a/icuuc.target.linux-x86_64.mk b/icuuc.target.linux-x86_64.mk
index 73fe286..7ab5455 100644
--- a/icuuc.target.linux-x86_64.mk
+++ b/icuuc.target.linux-x86_64.mk
@@ -199,6 +199,9 @@
LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := false
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_icuuc_gyp
diff --git a/system_icu.target.darwin-arm.mk b/system_icu.target.darwin-arm.mk
index 6ef7143..cba5365 100644
--- a/system_icu.target.darwin-arm.mk
+++ b/system_icu.target.darwin-arm.mk
@@ -19,6 +19,9 @@
LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := false
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_system_icu_gyp
diff --git a/system_icu.target.darwin-arm64.mk b/system_icu.target.darwin-arm64.mk
index 6ef7143..cba5365 100644
--- a/system_icu.target.darwin-arm64.mk
+++ b/system_icu.target.darwin-arm64.mk
@@ -19,6 +19,9 @@
LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := false
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_system_icu_gyp
diff --git a/system_icu.target.darwin-mips.mk b/system_icu.target.darwin-mips.mk
index 6ef7143..cba5365 100644
--- a/system_icu.target.darwin-mips.mk
+++ b/system_icu.target.darwin-mips.mk
@@ -19,6 +19,9 @@
LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := false
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_system_icu_gyp
diff --git a/system_icu.target.darwin-x86.mk b/system_icu.target.darwin-x86.mk
index 6ef7143..cba5365 100644
--- a/system_icu.target.darwin-x86.mk
+++ b/system_icu.target.darwin-x86.mk
@@ -19,6 +19,9 @@
LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := false
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_system_icu_gyp
diff --git a/system_icu.target.darwin-x86_64.mk b/system_icu.target.darwin-x86_64.mk
index 6ef7143..cba5365 100644
--- a/system_icu.target.darwin-x86_64.mk
+++ b/system_icu.target.darwin-x86_64.mk
@@ -19,6 +19,9 @@
LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := false
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_system_icu_gyp
diff --git a/system_icu.target.linux-arm.mk b/system_icu.target.linux-arm.mk
index 6ef7143..cba5365 100644
--- a/system_icu.target.linux-arm.mk
+++ b/system_icu.target.linux-arm.mk
@@ -19,6 +19,9 @@
LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := false
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_system_icu_gyp
diff --git a/system_icu.target.linux-arm64.mk b/system_icu.target.linux-arm64.mk
index 6ef7143..cba5365 100644
--- a/system_icu.target.linux-arm64.mk
+++ b/system_icu.target.linux-arm64.mk
@@ -19,6 +19,9 @@
LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := false
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_system_icu_gyp
diff --git a/system_icu.target.linux-mips.mk b/system_icu.target.linux-mips.mk
index 6ef7143..cba5365 100644
--- a/system_icu.target.linux-mips.mk
+++ b/system_icu.target.linux-mips.mk
@@ -19,6 +19,9 @@
LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := false
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_system_icu_gyp
diff --git a/system_icu.target.linux-x86.mk b/system_icu.target.linux-x86.mk
index 6ef7143..cba5365 100644
--- a/system_icu.target.linux-x86.mk
+++ b/system_icu.target.linux-x86.mk
@@ -19,6 +19,9 @@
LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := false
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_system_icu_gyp
diff --git a/system_icu.target.linux-x86_64.mk b/system_icu.target.linux-x86_64.mk
index 6ef7143..cba5365 100644
--- a/system_icu.target.linux-x86_64.mk
+++ b/system_icu.target.linux-x86_64.mk
@@ -19,6 +19,9 @@
LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := false
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_system_icu_gyp
