Update makefiles after merge of Chromium at 6e9c84566c9f
This commit was generated by merge_from_chromium.py.
Change-Id: I0970a63d13dd08fd38ccdaf8f41ba2fa674c7c19
diff --git a/libjpeg.target.darwin-arm.mk b/libjpeg.target.darwin-arm.mk
index a773b65..4457385 100644
--- a/libjpeg.target.darwin-arm.mk
+++ b/libjpeg.target.darwin-arm.mk
@@ -286,6 +286,9 @@
libstlport \
libdl
+### 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_libjpeg_turbo_libjpeg_gyp
diff --git a/libjpeg.target.darwin-arm64.mk b/libjpeg.target.darwin-arm64.mk
index e4a324d..d2473ee 100644
--- a/libjpeg.target.darwin-arm64.mk
+++ b/libjpeg.target.darwin-arm64.mk
@@ -262,6 +262,9 @@
libstlport \
libdl
+### 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_libjpeg_turbo_libjpeg_gyp
diff --git a/libjpeg.target.darwin-mips.mk b/libjpeg.target.darwin-mips.mk
index e6a06ab..802a5ee 100644
--- a/libjpeg.target.darwin-mips.mk
+++ b/libjpeg.target.darwin-mips.mk
@@ -271,6 +271,9 @@
libstlport \
libdl
+### 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_libjpeg_turbo_libjpeg_gyp
diff --git a/libjpeg.target.darwin-x86.mk b/libjpeg.target.darwin-x86.mk
index 5303634..78614c6 100644
--- a/libjpeg.target.darwin-x86.mk
+++ b/libjpeg.target.darwin-x86.mk
@@ -640,6 +640,9 @@
libstlport \
libdl
+### 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_libjpeg_turbo_libjpeg_gyp
diff --git a/libjpeg.target.darwin-x86_64.mk b/libjpeg.target.darwin-x86_64.mk
index 02a4291..d325da8 100644
--- a/libjpeg.target.darwin-x86_64.mk
+++ b/libjpeg.target.darwin-x86_64.mk
@@ -440,6 +440,9 @@
libstlport \
libdl
+### 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_libjpeg_turbo_libjpeg_gyp
diff --git a/libjpeg.target.linux-arm.mk b/libjpeg.target.linux-arm.mk
index a773b65..4457385 100644
--- a/libjpeg.target.linux-arm.mk
+++ b/libjpeg.target.linux-arm.mk
@@ -286,6 +286,9 @@
libstlport \
libdl
+### 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_libjpeg_turbo_libjpeg_gyp
diff --git a/libjpeg.target.linux-arm64.mk b/libjpeg.target.linux-arm64.mk
index e4a324d..d2473ee 100644
--- a/libjpeg.target.linux-arm64.mk
+++ b/libjpeg.target.linux-arm64.mk
@@ -262,6 +262,9 @@
libstlport \
libdl
+### 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_libjpeg_turbo_libjpeg_gyp
diff --git a/libjpeg.target.linux-mips.mk b/libjpeg.target.linux-mips.mk
index e6a06ab..802a5ee 100644
--- a/libjpeg.target.linux-mips.mk
+++ b/libjpeg.target.linux-mips.mk
@@ -271,6 +271,9 @@
libstlport \
libdl
+### 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_libjpeg_turbo_libjpeg_gyp
diff --git a/libjpeg.target.linux-x86.mk b/libjpeg.target.linux-x86.mk
index 5303634..78614c6 100644
--- a/libjpeg.target.linux-x86.mk
+++ b/libjpeg.target.linux-x86.mk
@@ -640,6 +640,9 @@
libstlport \
libdl
+### 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_libjpeg_turbo_libjpeg_gyp
diff --git a/libjpeg.target.linux-x86_64.mk b/libjpeg.target.linux-x86_64.mk
index 02a4291..d325da8 100644
--- a/libjpeg.target.linux-x86_64.mk
+++ b/libjpeg.target.linux-x86_64.mk
@@ -440,6 +440,9 @@
libstlport \
libdl
+### 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_libjpeg_turbo_libjpeg_gyp
