Update makefiles after merge of Chromium at 6e9c84566c9f
This commit was generated by merge_from_chromium.py.
Change-Id: If6401a5eb171a3bef5c30fdd04413b19b6963006
diff --git a/tools/gyp/v8.target.darwin-arm.mk b/tools/gyp/v8.target.darwin-arm.mk
index 1c74995..c6458c8 100644
--- a/tools/gyp/v8.target.darwin-arm.mk
+++ b/tools/gyp/v8.target.darwin-arm.mk
@@ -23,6 +23,7 @@
### Rules for final target.
### Set directly by aosp_build_settings.
LOCAL_FDO_SUPPORT := true
+LOCAL_CLANG := false
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
diff --git a/tools/gyp/v8.target.darwin-arm64.mk b/tools/gyp/v8.target.darwin-arm64.mk
index 1c74995..c6458c8 100644
--- a/tools/gyp/v8.target.darwin-arm64.mk
+++ b/tools/gyp/v8.target.darwin-arm64.mk
@@ -23,6 +23,7 @@
### Rules for final target.
### Set directly by aosp_build_settings.
LOCAL_FDO_SUPPORT := true
+LOCAL_CLANG := false
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
diff --git a/tools/gyp/v8.target.darwin-mips.mk b/tools/gyp/v8.target.darwin-mips.mk
index 1c74995..c6458c8 100644
--- a/tools/gyp/v8.target.darwin-mips.mk
+++ b/tools/gyp/v8.target.darwin-mips.mk
@@ -23,6 +23,7 @@
### Rules for final target.
### Set directly by aosp_build_settings.
LOCAL_FDO_SUPPORT := true
+LOCAL_CLANG := false
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
diff --git a/tools/gyp/v8.target.darwin-x86.mk b/tools/gyp/v8.target.darwin-x86.mk
index 1c74995..c6458c8 100644
--- a/tools/gyp/v8.target.darwin-x86.mk
+++ b/tools/gyp/v8.target.darwin-x86.mk
@@ -23,6 +23,7 @@
### Rules for final target.
### Set directly by aosp_build_settings.
LOCAL_FDO_SUPPORT := true
+LOCAL_CLANG := false
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
diff --git a/tools/gyp/v8.target.darwin-x86_64.mk b/tools/gyp/v8.target.darwin-x86_64.mk
index 1c74995..c6458c8 100644
--- a/tools/gyp/v8.target.darwin-x86_64.mk
+++ b/tools/gyp/v8.target.darwin-x86_64.mk
@@ -23,6 +23,7 @@
### Rules for final target.
### Set directly by aosp_build_settings.
LOCAL_FDO_SUPPORT := true
+LOCAL_CLANG := false
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
diff --git a/tools/gyp/v8.target.linux-arm.mk b/tools/gyp/v8.target.linux-arm.mk
index 1c74995..c6458c8 100644
--- a/tools/gyp/v8.target.linux-arm.mk
+++ b/tools/gyp/v8.target.linux-arm.mk
@@ -23,6 +23,7 @@
### Rules for final target.
### Set directly by aosp_build_settings.
LOCAL_FDO_SUPPORT := true
+LOCAL_CLANG := false
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
diff --git a/tools/gyp/v8.target.linux-arm64.mk b/tools/gyp/v8.target.linux-arm64.mk
index 1c74995..c6458c8 100644
--- a/tools/gyp/v8.target.linux-arm64.mk
+++ b/tools/gyp/v8.target.linux-arm64.mk
@@ -23,6 +23,7 @@
### Rules for final target.
### Set directly by aosp_build_settings.
LOCAL_FDO_SUPPORT := true
+LOCAL_CLANG := false
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
diff --git a/tools/gyp/v8.target.linux-mips.mk b/tools/gyp/v8.target.linux-mips.mk
index 1c74995..c6458c8 100644
--- a/tools/gyp/v8.target.linux-mips.mk
+++ b/tools/gyp/v8.target.linux-mips.mk
@@ -23,6 +23,7 @@
### Rules for final target.
### Set directly by aosp_build_settings.
LOCAL_FDO_SUPPORT := true
+LOCAL_CLANG := false
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
diff --git a/tools/gyp/v8.target.linux-x86.mk b/tools/gyp/v8.target.linux-x86.mk
index 1c74995..c6458c8 100644
--- a/tools/gyp/v8.target.linux-x86.mk
+++ b/tools/gyp/v8.target.linux-x86.mk
@@ -23,6 +23,7 @@
### Rules for final target.
### Set directly by aosp_build_settings.
LOCAL_FDO_SUPPORT := true
+LOCAL_CLANG := false
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
diff --git a/tools/gyp/v8.target.linux-x86_64.mk b/tools/gyp/v8.target.linux-x86_64.mk
index 1c74995..c6458c8 100644
--- a/tools/gyp/v8.target.linux-x86_64.mk
+++ b/tools/gyp/v8.target.linux-x86_64.mk
@@ -23,6 +23,7 @@
### Rules for final target.
### Set directly by aosp_build_settings.
LOCAL_FDO_SUPPORT := true
+LOCAL_CLANG := false
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
diff --git a/tools/gyp/v8_base.target.darwin-arm.mk b/tools/gyp/v8_base.target.darwin-arm.mk
index fc93ee6..1c06555 100644
--- a/tools/gyp/v8_base.target.darwin-arm.mk
+++ b/tools/gyp/v8_base.target.darwin-arm.mk
@@ -519,6 +519,7 @@
### Set directly by aosp_build_settings.
LOCAL_FDO_SUPPORT := true
+LOCAL_CLANG := false
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
diff --git a/tools/gyp/v8_base.target.darwin-arm64.mk b/tools/gyp/v8_base.target.darwin-arm64.mk
index ced3305..fc21bbe 100644
--- a/tools/gyp/v8_base.target.darwin-arm64.mk
+++ b/tools/gyp/v8_base.target.darwin-arm64.mk
@@ -497,6 +497,7 @@
### Set directly by aosp_build_settings.
LOCAL_FDO_SUPPORT := true
+LOCAL_CLANG := false
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
diff --git a/tools/gyp/v8_base.target.darwin-mips.mk b/tools/gyp/v8_base.target.darwin-mips.mk
index 43f6397..3e8fa6f 100644
--- a/tools/gyp/v8_base.target.darwin-mips.mk
+++ b/tools/gyp/v8_base.target.darwin-mips.mk
@@ -511,6 +511,7 @@
### Set directly by aosp_build_settings.
LOCAL_FDO_SUPPORT := true
+LOCAL_CLANG := false
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
diff --git a/tools/gyp/v8_base.target.darwin-x86.mk b/tools/gyp/v8_base.target.darwin-x86.mk
index 5527022..5cdd622 100644
--- a/tools/gyp/v8_base.target.darwin-x86.mk
+++ b/tools/gyp/v8_base.target.darwin-x86.mk
@@ -505,6 +505,7 @@
### Set directly by aosp_build_settings.
LOCAL_FDO_SUPPORT := true
+LOCAL_CLANG := false
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
diff --git a/tools/gyp/v8_base.target.darwin-x86_64.mk b/tools/gyp/v8_base.target.darwin-x86_64.mk
index 02aeb5e..43e38c0 100644
--- a/tools/gyp/v8_base.target.darwin-x86_64.mk
+++ b/tools/gyp/v8_base.target.darwin-x86_64.mk
@@ -503,6 +503,7 @@
### Set directly by aosp_build_settings.
LOCAL_FDO_SUPPORT := true
+LOCAL_CLANG := false
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
diff --git a/tools/gyp/v8_base.target.linux-arm.mk b/tools/gyp/v8_base.target.linux-arm.mk
index fc93ee6..1c06555 100644
--- a/tools/gyp/v8_base.target.linux-arm.mk
+++ b/tools/gyp/v8_base.target.linux-arm.mk
@@ -519,6 +519,7 @@
### Set directly by aosp_build_settings.
LOCAL_FDO_SUPPORT := true
+LOCAL_CLANG := false
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
diff --git a/tools/gyp/v8_base.target.linux-arm64.mk b/tools/gyp/v8_base.target.linux-arm64.mk
index ced3305..fc21bbe 100644
--- a/tools/gyp/v8_base.target.linux-arm64.mk
+++ b/tools/gyp/v8_base.target.linux-arm64.mk
@@ -497,6 +497,7 @@
### Set directly by aosp_build_settings.
LOCAL_FDO_SUPPORT := true
+LOCAL_CLANG := false
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
diff --git a/tools/gyp/v8_base.target.linux-mips.mk b/tools/gyp/v8_base.target.linux-mips.mk
index 43f6397..3e8fa6f 100644
--- a/tools/gyp/v8_base.target.linux-mips.mk
+++ b/tools/gyp/v8_base.target.linux-mips.mk
@@ -511,6 +511,7 @@
### Set directly by aosp_build_settings.
LOCAL_FDO_SUPPORT := true
+LOCAL_CLANG := false
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
diff --git a/tools/gyp/v8_base.target.linux-x86.mk b/tools/gyp/v8_base.target.linux-x86.mk
index 5527022..5cdd622 100644
--- a/tools/gyp/v8_base.target.linux-x86.mk
+++ b/tools/gyp/v8_base.target.linux-x86.mk
@@ -505,6 +505,7 @@
### Set directly by aosp_build_settings.
LOCAL_FDO_SUPPORT := true
+LOCAL_CLANG := false
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
diff --git a/tools/gyp/v8_base.target.linux-x86_64.mk b/tools/gyp/v8_base.target.linux-x86_64.mk
index 02aeb5e..43e38c0 100644
--- a/tools/gyp/v8_base.target.linux-x86_64.mk
+++ b/tools/gyp/v8_base.target.linux-x86_64.mk
@@ -503,6 +503,7 @@
### Set directly by aosp_build_settings.
LOCAL_FDO_SUPPORT := true
+LOCAL_CLANG := false
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
diff --git a/tools/gyp/v8_libbase.target.darwin-arm.mk b/tools/gyp/v8_libbase.target.darwin-arm.mk
index d3f2e1d..1c88002 100644
--- a/tools/gyp/v8_libbase.target.darwin-arm.mk
+++ b/tools/gyp/v8_libbase.target.darwin-arm.mk
@@ -266,6 +266,7 @@
### Set directly by aosp_build_settings.
LOCAL_FDO_SUPPORT := true
+LOCAL_CLANG := false
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
diff --git a/tools/gyp/v8_libbase.target.darwin-arm64.mk b/tools/gyp/v8_libbase.target.darwin-arm64.mk
index daa349b..8c7cf57 100644
--- a/tools/gyp/v8_libbase.target.darwin-arm64.mk
+++ b/tools/gyp/v8_libbase.target.darwin-arm64.mk
@@ -240,6 +240,7 @@
### Set directly by aosp_build_settings.
LOCAL_FDO_SUPPORT := true
+LOCAL_CLANG := false
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
diff --git a/tools/gyp/v8_libbase.target.darwin-mips.mk b/tools/gyp/v8_libbase.target.darwin-mips.mk
index 153462f..22c16d7 100644
--- a/tools/gyp/v8_libbase.target.darwin-mips.mk
+++ b/tools/gyp/v8_libbase.target.darwin-mips.mk
@@ -258,6 +258,7 @@
### Set directly by aosp_build_settings.
LOCAL_FDO_SUPPORT := true
+LOCAL_CLANG := false
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
diff --git a/tools/gyp/v8_libbase.target.darwin-x86.mk b/tools/gyp/v8_libbase.target.darwin-x86.mk
index 99f0590..73d952f 100644
--- a/tools/gyp/v8_libbase.target.darwin-x86.mk
+++ b/tools/gyp/v8_libbase.target.darwin-x86.mk
@@ -254,6 +254,7 @@
### Set directly by aosp_build_settings.
LOCAL_FDO_SUPPORT := true
+LOCAL_CLANG := false
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
diff --git a/tools/gyp/v8_libbase.target.darwin-x86_64.mk b/tools/gyp/v8_libbase.target.darwin-x86_64.mk
index 1519264..172c219 100644
--- a/tools/gyp/v8_libbase.target.darwin-x86_64.mk
+++ b/tools/gyp/v8_libbase.target.darwin-x86_64.mk
@@ -252,6 +252,7 @@
### Set directly by aosp_build_settings.
LOCAL_FDO_SUPPORT := true
+LOCAL_CLANG := false
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
diff --git a/tools/gyp/v8_libbase.target.linux-arm.mk b/tools/gyp/v8_libbase.target.linux-arm.mk
index d3f2e1d..1c88002 100644
--- a/tools/gyp/v8_libbase.target.linux-arm.mk
+++ b/tools/gyp/v8_libbase.target.linux-arm.mk
@@ -266,6 +266,7 @@
### Set directly by aosp_build_settings.
LOCAL_FDO_SUPPORT := true
+LOCAL_CLANG := false
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
diff --git a/tools/gyp/v8_libbase.target.linux-arm64.mk b/tools/gyp/v8_libbase.target.linux-arm64.mk
index daa349b..8c7cf57 100644
--- a/tools/gyp/v8_libbase.target.linux-arm64.mk
+++ b/tools/gyp/v8_libbase.target.linux-arm64.mk
@@ -240,6 +240,7 @@
### Set directly by aosp_build_settings.
LOCAL_FDO_SUPPORT := true
+LOCAL_CLANG := false
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
diff --git a/tools/gyp/v8_libbase.target.linux-mips.mk b/tools/gyp/v8_libbase.target.linux-mips.mk
index 153462f..22c16d7 100644
--- a/tools/gyp/v8_libbase.target.linux-mips.mk
+++ b/tools/gyp/v8_libbase.target.linux-mips.mk
@@ -258,6 +258,7 @@
### Set directly by aosp_build_settings.
LOCAL_FDO_SUPPORT := true
+LOCAL_CLANG := false
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
diff --git a/tools/gyp/v8_libbase.target.linux-x86.mk b/tools/gyp/v8_libbase.target.linux-x86.mk
index 99f0590..73d952f 100644
--- a/tools/gyp/v8_libbase.target.linux-x86.mk
+++ b/tools/gyp/v8_libbase.target.linux-x86.mk
@@ -254,6 +254,7 @@
### Set directly by aosp_build_settings.
LOCAL_FDO_SUPPORT := true
+LOCAL_CLANG := false
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
diff --git a/tools/gyp/v8_libbase.target.linux-x86_64.mk b/tools/gyp/v8_libbase.target.linux-x86_64.mk
index 1519264..172c219 100644
--- a/tools/gyp/v8_libbase.target.linux-x86_64.mk
+++ b/tools/gyp/v8_libbase.target.linux-x86_64.mk
@@ -252,6 +252,7 @@
### Set directly by aosp_build_settings.
LOCAL_FDO_SUPPORT := true
+LOCAL_CLANG := false
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
diff --git a/tools/gyp/v8_snapshot.target.darwin-arm.mk b/tools/gyp/v8_snapshot.target.darwin-arm.mk
index a91f119..b9fe2e3 100644
--- a/tools/gyp/v8_snapshot.target.darwin-arm.mk
+++ b/tools/gyp/v8_snapshot.target.darwin-arm.mk
@@ -279,6 +279,7 @@
### Set directly by aosp_build_settings.
LOCAL_FDO_SUPPORT := true
+LOCAL_CLANG := false
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
diff --git a/tools/gyp/v8_snapshot.target.darwin-arm64.mk b/tools/gyp/v8_snapshot.target.darwin-arm64.mk
index a7db245..f6c6654 100644
--- a/tools/gyp/v8_snapshot.target.darwin-arm64.mk
+++ b/tools/gyp/v8_snapshot.target.darwin-arm64.mk
@@ -253,6 +253,7 @@
### Set directly by aosp_build_settings.
LOCAL_FDO_SUPPORT := true
+LOCAL_CLANG := false
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
diff --git a/tools/gyp/v8_snapshot.target.darwin-mips.mk b/tools/gyp/v8_snapshot.target.darwin-mips.mk
index 011e790..9dcea77 100644
--- a/tools/gyp/v8_snapshot.target.darwin-mips.mk
+++ b/tools/gyp/v8_snapshot.target.darwin-mips.mk
@@ -271,6 +271,7 @@
### Set directly by aosp_build_settings.
LOCAL_FDO_SUPPORT := true
+LOCAL_CLANG := false
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
diff --git a/tools/gyp/v8_snapshot.target.darwin-x86.mk b/tools/gyp/v8_snapshot.target.darwin-x86.mk
index f7dfb53..3cd9685 100644
--- a/tools/gyp/v8_snapshot.target.darwin-x86.mk
+++ b/tools/gyp/v8_snapshot.target.darwin-x86.mk
@@ -267,6 +267,7 @@
### Set directly by aosp_build_settings.
LOCAL_FDO_SUPPORT := true
+LOCAL_CLANG := false
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
diff --git a/tools/gyp/v8_snapshot.target.darwin-x86_64.mk b/tools/gyp/v8_snapshot.target.darwin-x86_64.mk
index e1eb72a..2c7435b 100644
--- a/tools/gyp/v8_snapshot.target.darwin-x86_64.mk
+++ b/tools/gyp/v8_snapshot.target.darwin-x86_64.mk
@@ -265,6 +265,7 @@
### Set directly by aosp_build_settings.
LOCAL_FDO_SUPPORT := true
+LOCAL_CLANG := false
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
diff --git a/tools/gyp/v8_snapshot.target.linux-arm.mk b/tools/gyp/v8_snapshot.target.linux-arm.mk
index a91f119..b9fe2e3 100644
--- a/tools/gyp/v8_snapshot.target.linux-arm.mk
+++ b/tools/gyp/v8_snapshot.target.linux-arm.mk
@@ -279,6 +279,7 @@
### Set directly by aosp_build_settings.
LOCAL_FDO_SUPPORT := true
+LOCAL_CLANG := false
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
diff --git a/tools/gyp/v8_snapshot.target.linux-arm64.mk b/tools/gyp/v8_snapshot.target.linux-arm64.mk
index a7db245..f6c6654 100644
--- a/tools/gyp/v8_snapshot.target.linux-arm64.mk
+++ b/tools/gyp/v8_snapshot.target.linux-arm64.mk
@@ -253,6 +253,7 @@
### Set directly by aosp_build_settings.
LOCAL_FDO_SUPPORT := true
+LOCAL_CLANG := false
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
diff --git a/tools/gyp/v8_snapshot.target.linux-mips.mk b/tools/gyp/v8_snapshot.target.linux-mips.mk
index 011e790..9dcea77 100644
--- a/tools/gyp/v8_snapshot.target.linux-mips.mk
+++ b/tools/gyp/v8_snapshot.target.linux-mips.mk
@@ -271,6 +271,7 @@
### Set directly by aosp_build_settings.
LOCAL_FDO_SUPPORT := true
+LOCAL_CLANG := false
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
diff --git a/tools/gyp/v8_snapshot.target.linux-x86.mk b/tools/gyp/v8_snapshot.target.linux-x86.mk
index f7dfb53..3cd9685 100644
--- a/tools/gyp/v8_snapshot.target.linux-x86.mk
+++ b/tools/gyp/v8_snapshot.target.linux-x86.mk
@@ -267,6 +267,7 @@
### Set directly by aosp_build_settings.
LOCAL_FDO_SUPPORT := true
+LOCAL_CLANG := false
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
diff --git a/tools/gyp/v8_snapshot.target.linux-x86_64.mk b/tools/gyp/v8_snapshot.target.linux-x86_64.mk
index e1eb72a..2c7435b 100644
--- a/tools/gyp/v8_snapshot.target.linux-x86_64.mk
+++ b/tools/gyp/v8_snapshot.target.linux-x86_64.mk
@@ -265,6 +265,7 @@
### Set directly by aosp_build_settings.
LOCAL_FDO_SUPPORT := true
+LOCAL_CLANG := false
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
