Update makefiles after merge of Chromium at 6e9c84566c9f
This commit was generated by merge_from_chromium.py.
Change-Id: Iedc2a01b4fff2a629bbb374cf069c0baebd4f1bd
diff --git a/gen_asm_offsets_vp8.target.darwin-arm.mk b/gen_asm_offsets_vp8.target.darwin-arm.mk
index 3c6b8a4..deed221 100644
--- a/gen_asm_offsets_vp8.target.darwin-arm.mk
+++ b/gen_asm_offsets_vp8.target.darwin-arm.mk
@@ -257,6 +257,9 @@
LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
### 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_libvpx_gen_asm_offsets_vp8_gyp
diff --git a/gen_asm_offsets_vp8.target.darwin-arm64.mk b/gen_asm_offsets_vp8.target.darwin-arm64.mk
index 0e4cfa0..6fc2e86 100644
--- a/gen_asm_offsets_vp8.target.darwin-arm64.mk
+++ b/gen_asm_offsets_vp8.target.darwin-arm64.mk
@@ -233,6 +233,9 @@
LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
### 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_libvpx_gen_asm_offsets_vp8_gyp
diff --git a/gen_asm_offsets_vp8.target.darwin-x86.mk b/gen_asm_offsets_vp8.target.darwin-x86.mk
index f208ef4..5d07521 100644
--- a/gen_asm_offsets_vp8.target.darwin-x86.mk
+++ b/gen_asm_offsets_vp8.target.darwin-x86.mk
@@ -245,6 +245,9 @@
LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
### 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_libvpx_gen_asm_offsets_vp8_gyp
diff --git a/gen_asm_offsets_vp8.target.darwin-x86_64.mk b/gen_asm_offsets_vp8.target.darwin-x86_64.mk
index d1e8cd4..96a1cc9 100644
--- a/gen_asm_offsets_vp8.target.darwin-x86_64.mk
+++ b/gen_asm_offsets_vp8.target.darwin-x86_64.mk
@@ -243,6 +243,9 @@
LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
### 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_libvpx_gen_asm_offsets_vp8_gyp
diff --git a/gen_asm_offsets_vp8.target.linux-arm.mk b/gen_asm_offsets_vp8.target.linux-arm.mk
index 3c6b8a4..deed221 100644
--- a/gen_asm_offsets_vp8.target.linux-arm.mk
+++ b/gen_asm_offsets_vp8.target.linux-arm.mk
@@ -257,6 +257,9 @@
LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
### 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_libvpx_gen_asm_offsets_vp8_gyp
diff --git a/gen_asm_offsets_vp8.target.linux-arm64.mk b/gen_asm_offsets_vp8.target.linux-arm64.mk
index 0e4cfa0..6fc2e86 100644
--- a/gen_asm_offsets_vp8.target.linux-arm64.mk
+++ b/gen_asm_offsets_vp8.target.linux-arm64.mk
@@ -233,6 +233,9 @@
LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
### 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_libvpx_gen_asm_offsets_vp8_gyp
diff --git a/gen_asm_offsets_vp8.target.linux-x86.mk b/gen_asm_offsets_vp8.target.linux-x86.mk
index f208ef4..5d07521 100644
--- a/gen_asm_offsets_vp8.target.linux-x86.mk
+++ b/gen_asm_offsets_vp8.target.linux-x86.mk
@@ -245,6 +245,9 @@
LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
### 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_libvpx_gen_asm_offsets_vp8_gyp
diff --git a/gen_asm_offsets_vp8.target.linux-x86_64.mk b/gen_asm_offsets_vp8.target.linux-x86_64.mk
index d1e8cd4..96a1cc9 100644
--- a/gen_asm_offsets_vp8.target.linux-x86_64.mk
+++ b/gen_asm_offsets_vp8.target.linux-x86_64.mk
@@ -243,6 +243,9 @@
LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
### 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_libvpx_gen_asm_offsets_vp8_gyp
diff --git a/gen_asm_offsets_vpx_scale.target.darwin-arm.mk b/gen_asm_offsets_vpx_scale.target.darwin-arm.mk
index 677df0f..590d325 100644
--- a/gen_asm_offsets_vpx_scale.target.darwin-arm.mk
+++ b/gen_asm_offsets_vpx_scale.target.darwin-arm.mk
@@ -257,6 +257,9 @@
LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
### 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_libvpx_gen_asm_offsets_vpx_scale_gyp
diff --git a/gen_asm_offsets_vpx_scale.target.linux-arm.mk b/gen_asm_offsets_vpx_scale.target.linux-arm.mk
index 677df0f..590d325 100644
--- a/gen_asm_offsets_vpx_scale.target.linux-arm.mk
+++ b/gen_asm_offsets_vpx_scale.target.linux-arm.mk
@@ -257,6 +257,9 @@
LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
### 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_libvpx_gen_asm_offsets_vpx_scale_gyp
diff --git a/libvpx.target.darwin-arm.mk b/libvpx.target.darwin-arm.mk
index 4808d4a..241db84 100644
--- a/libvpx.target.darwin-arm.mk
+++ b/libvpx.target.darwin-arm.mk
@@ -1014,6 +1014,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_libvpx_libvpx_gyp
diff --git a/libvpx.target.darwin-arm64.mk b/libvpx.target.darwin-arm64.mk
index 6d8f458..38e5acc 100644
--- a/libvpx.target.darwin-arm64.mk
+++ b/libvpx.target.darwin-arm64.mk
@@ -398,6 +398,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_libvpx_libvpx_gyp
diff --git a/libvpx.target.darwin-mips.mk b/libvpx.target.darwin-mips.mk
index 93aaf3f..29357ee 100644
--- a/libvpx.target.darwin-mips.mk
+++ b/libvpx.target.darwin-mips.mk
@@ -371,6 +371,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_libvpx_libvpx_gyp
diff --git a/libvpx.target.darwin-x86.mk b/libvpx.target.darwin-x86.mk
index e875ced..2044d82 100644
--- a/libvpx.target.darwin-x86.mk
+++ b/libvpx.target.darwin-x86.mk
@@ -932,6 +932,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_libvpx_libvpx_gyp
diff --git a/libvpx.target.darwin-x86_64.mk b/libvpx.target.darwin-x86_64.mk
index b9e601a..7b0c4bb 100644
--- a/libvpx.target.darwin-x86_64.mk
+++ b/libvpx.target.darwin-x86_64.mk
@@ -996,6 +996,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_libvpx_libvpx_gyp
diff --git a/libvpx.target.linux-arm.mk b/libvpx.target.linux-arm.mk
index 4808d4a..241db84 100644
--- a/libvpx.target.linux-arm.mk
+++ b/libvpx.target.linux-arm.mk
@@ -1014,6 +1014,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_libvpx_libvpx_gyp
diff --git a/libvpx.target.linux-arm64.mk b/libvpx.target.linux-arm64.mk
index 6d8f458..38e5acc 100644
--- a/libvpx.target.linux-arm64.mk
+++ b/libvpx.target.linux-arm64.mk
@@ -398,6 +398,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_libvpx_libvpx_gyp
diff --git a/libvpx.target.linux-mips.mk b/libvpx.target.linux-mips.mk
index 93aaf3f..29357ee 100644
--- a/libvpx.target.linux-mips.mk
+++ b/libvpx.target.linux-mips.mk
@@ -371,6 +371,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_libvpx_libvpx_gyp
diff --git a/libvpx.target.linux-x86.mk b/libvpx.target.linux-x86.mk
index e875ced..2044d82 100644
--- a/libvpx.target.linux-x86.mk
+++ b/libvpx.target.linux-x86.mk
@@ -932,6 +932,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_libvpx_libvpx_gyp
diff --git a/libvpx.target.linux-x86_64.mk b/libvpx.target.linux-x86_64.mk
index b9e601a..7b0c4bb 100644
--- a/libvpx.target.linux-x86_64.mk
+++ b/libvpx.target.linux-x86_64.mk
@@ -996,6 +996,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_libvpx_libvpx_gyp
diff --git a/libvpx_asm_offsets_vp8.target.darwin-arm.mk b/libvpx_asm_offsets_vp8.target.darwin-arm.mk
index ce0e652..88379f5 100644
--- a/libvpx_asm_offsets_vp8.target.darwin-arm.mk
+++ b/libvpx_asm_offsets_vp8.target.darwin-arm.mk
@@ -238,6 +238,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: libvpx_asm_offsets_vp8
diff --git a/libvpx_asm_offsets_vp8.target.darwin-arm64.mk b/libvpx_asm_offsets_vp8.target.darwin-arm64.mk
index 86bfd1b..cc21851 100644
--- a/libvpx_asm_offsets_vp8.target.darwin-arm64.mk
+++ b/libvpx_asm_offsets_vp8.target.darwin-arm64.mk
@@ -214,6 +214,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: libvpx_asm_offsets_vp8
diff --git a/libvpx_asm_offsets_vp8.target.darwin-x86.mk b/libvpx_asm_offsets_vp8.target.darwin-x86.mk
index 3b4fabb..ca5a7ca 100644
--- a/libvpx_asm_offsets_vp8.target.darwin-x86.mk
+++ b/libvpx_asm_offsets_vp8.target.darwin-x86.mk
@@ -226,6 +226,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: libvpx_asm_offsets_vp8
diff --git a/libvpx_asm_offsets_vp8.target.darwin-x86_64.mk b/libvpx_asm_offsets_vp8.target.darwin-x86_64.mk
index 7a38a8b..e63a58b 100644
--- a/libvpx_asm_offsets_vp8.target.darwin-x86_64.mk
+++ b/libvpx_asm_offsets_vp8.target.darwin-x86_64.mk
@@ -224,6 +224,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: libvpx_asm_offsets_vp8
diff --git a/libvpx_asm_offsets_vp8.target.linux-arm.mk b/libvpx_asm_offsets_vp8.target.linux-arm.mk
index ce0e652..88379f5 100644
--- a/libvpx_asm_offsets_vp8.target.linux-arm.mk
+++ b/libvpx_asm_offsets_vp8.target.linux-arm.mk
@@ -238,6 +238,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: libvpx_asm_offsets_vp8
diff --git a/libvpx_asm_offsets_vp8.target.linux-arm64.mk b/libvpx_asm_offsets_vp8.target.linux-arm64.mk
index 86bfd1b..cc21851 100644
--- a/libvpx_asm_offsets_vp8.target.linux-arm64.mk
+++ b/libvpx_asm_offsets_vp8.target.linux-arm64.mk
@@ -214,6 +214,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: libvpx_asm_offsets_vp8
diff --git a/libvpx_asm_offsets_vp8.target.linux-x86.mk b/libvpx_asm_offsets_vp8.target.linux-x86.mk
index 3b4fabb..ca5a7ca 100644
--- a/libvpx_asm_offsets_vp8.target.linux-x86.mk
+++ b/libvpx_asm_offsets_vp8.target.linux-x86.mk
@@ -226,6 +226,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: libvpx_asm_offsets_vp8
diff --git a/libvpx_asm_offsets_vp8.target.linux-x86_64.mk b/libvpx_asm_offsets_vp8.target.linux-x86_64.mk
index 7a38a8b..e63a58b 100644
--- a/libvpx_asm_offsets_vp8.target.linux-x86_64.mk
+++ b/libvpx_asm_offsets_vp8.target.linux-x86_64.mk
@@ -224,6 +224,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: libvpx_asm_offsets_vp8
diff --git a/libvpx_asm_offsets_vpx_scale.target.darwin-arm.mk b/libvpx_asm_offsets_vpx_scale.target.darwin-arm.mk
index c845ab2..95dd87c 100644
--- a/libvpx_asm_offsets_vpx_scale.target.darwin-arm.mk
+++ b/libvpx_asm_offsets_vpx_scale.target.darwin-arm.mk
@@ -238,6 +238,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: libvpx_asm_offsets_vpx_scale
diff --git a/libvpx_asm_offsets_vpx_scale.target.linux-arm.mk b/libvpx_asm_offsets_vpx_scale.target.linux-arm.mk
index c845ab2..95dd87c 100644
--- a/libvpx_asm_offsets_vpx_scale.target.linux-arm.mk
+++ b/libvpx_asm_offsets_vpx_scale.target.linux-arm.mk
@@ -238,6 +238,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: libvpx_asm_offsets_vpx_scale
diff --git a/libvpx_intrinsics_mmx.target.darwin-x86.mk b/libvpx_intrinsics_mmx.target.darwin-x86.mk
index 6141678..38b47b6 100644
--- a/libvpx_intrinsics_mmx.target.darwin-x86.mk
+++ b/libvpx_intrinsics_mmx.target.darwin-x86.mk
@@ -228,6 +228,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_libvpx_libvpx_intrinsics_mmx_gyp
diff --git a/libvpx_intrinsics_mmx.target.darwin-x86_64.mk b/libvpx_intrinsics_mmx.target.darwin-x86_64.mk
index bbf5958..e78500e 100644
--- a/libvpx_intrinsics_mmx.target.darwin-x86_64.mk
+++ b/libvpx_intrinsics_mmx.target.darwin-x86_64.mk
@@ -226,6 +226,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_libvpx_libvpx_intrinsics_mmx_gyp
diff --git a/libvpx_intrinsics_mmx.target.linux-x86.mk b/libvpx_intrinsics_mmx.target.linux-x86.mk
index 6141678..38b47b6 100644
--- a/libvpx_intrinsics_mmx.target.linux-x86.mk
+++ b/libvpx_intrinsics_mmx.target.linux-x86.mk
@@ -228,6 +228,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_libvpx_libvpx_intrinsics_mmx_gyp
diff --git a/libvpx_intrinsics_mmx.target.linux-x86_64.mk b/libvpx_intrinsics_mmx.target.linux-x86_64.mk
index bbf5958..e78500e 100644
--- a/libvpx_intrinsics_mmx.target.linux-x86_64.mk
+++ b/libvpx_intrinsics_mmx.target.linux-x86_64.mk
@@ -226,6 +226,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_libvpx_libvpx_intrinsics_mmx_gyp
diff --git a/libvpx_intrinsics_neon.target.darwin-arm.mk b/libvpx_intrinsics_neon.target.darwin-arm.mk
index e449dc2..c5e6884 100644
--- a/libvpx_intrinsics_neon.target.darwin-arm.mk
+++ b/libvpx_intrinsics_neon.target.darwin-arm.mk
@@ -269,6 +269,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_libvpx_libvpx_intrinsics_neon_gyp
diff --git a/libvpx_intrinsics_neon.target.linux-arm.mk b/libvpx_intrinsics_neon.target.linux-arm.mk
index e449dc2..c5e6884 100644
--- a/libvpx_intrinsics_neon.target.linux-arm.mk
+++ b/libvpx_intrinsics_neon.target.linux-arm.mk
@@ -269,6 +269,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_libvpx_libvpx_intrinsics_neon_gyp
diff --git a/libvpx_intrinsics_sse2.target.darwin-x86.mk b/libvpx_intrinsics_sse2.target.darwin-x86.mk
index e0948c8..31c55ef 100644
--- a/libvpx_intrinsics_sse2.target.darwin-x86.mk
+++ b/libvpx_intrinsics_sse2.target.darwin-x86.mk
@@ -236,6 +236,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_libvpx_libvpx_intrinsics_sse2_gyp
diff --git a/libvpx_intrinsics_sse2.target.darwin-x86_64.mk b/libvpx_intrinsics_sse2.target.darwin-x86_64.mk
index 5365298..f24a07d 100644
--- a/libvpx_intrinsics_sse2.target.darwin-x86_64.mk
+++ b/libvpx_intrinsics_sse2.target.darwin-x86_64.mk
@@ -234,6 +234,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_libvpx_libvpx_intrinsics_sse2_gyp
diff --git a/libvpx_intrinsics_sse2.target.linux-x86.mk b/libvpx_intrinsics_sse2.target.linux-x86.mk
index e0948c8..31c55ef 100644
--- a/libvpx_intrinsics_sse2.target.linux-x86.mk
+++ b/libvpx_intrinsics_sse2.target.linux-x86.mk
@@ -236,6 +236,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_libvpx_libvpx_intrinsics_sse2_gyp
diff --git a/libvpx_intrinsics_sse2.target.linux-x86_64.mk b/libvpx_intrinsics_sse2.target.linux-x86_64.mk
index 5365298..f24a07d 100644
--- a/libvpx_intrinsics_sse2.target.linux-x86_64.mk
+++ b/libvpx_intrinsics_sse2.target.linux-x86_64.mk
@@ -234,6 +234,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_libvpx_libvpx_intrinsics_sse2_gyp
diff --git a/libvpx_intrinsics_sse4_1.target.darwin-x86.mk b/libvpx_intrinsics_sse4_1.target.darwin-x86.mk
index 3ca0198..fed5d74 100644
--- a/libvpx_intrinsics_sse4_1.target.darwin-x86.mk
+++ b/libvpx_intrinsics_sse4_1.target.darwin-x86.mk
@@ -226,6 +226,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_libvpx_libvpx_intrinsics_sse4_1_gyp
diff --git a/libvpx_intrinsics_sse4_1.target.darwin-x86_64.mk b/libvpx_intrinsics_sse4_1.target.darwin-x86_64.mk
index e90c395..38e954a 100644
--- a/libvpx_intrinsics_sse4_1.target.darwin-x86_64.mk
+++ b/libvpx_intrinsics_sse4_1.target.darwin-x86_64.mk
@@ -224,6 +224,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_libvpx_libvpx_intrinsics_sse4_1_gyp
diff --git a/libvpx_intrinsics_sse4_1.target.linux-x86.mk b/libvpx_intrinsics_sse4_1.target.linux-x86.mk
index 3ca0198..fed5d74 100644
--- a/libvpx_intrinsics_sse4_1.target.linux-x86.mk
+++ b/libvpx_intrinsics_sse4_1.target.linux-x86.mk
@@ -226,6 +226,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_libvpx_libvpx_intrinsics_sse4_1_gyp
diff --git a/libvpx_intrinsics_sse4_1.target.linux-x86_64.mk b/libvpx_intrinsics_sse4_1.target.linux-x86_64.mk
index e90c395..38e954a 100644
--- a/libvpx_intrinsics_sse4_1.target.linux-x86_64.mk
+++ b/libvpx_intrinsics_sse4_1.target.linux-x86_64.mk
@@ -224,6 +224,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_libvpx_libvpx_intrinsics_sse4_1_gyp
diff --git a/libvpx_intrinsics_ssse3.target.darwin-x86.mk b/libvpx_intrinsics_ssse3.target.darwin-x86.mk
index 20d3c48..5a69ff5 100644
--- a/libvpx_intrinsics_ssse3.target.darwin-x86.mk
+++ b/libvpx_intrinsics_ssse3.target.darwin-x86.mk
@@ -229,6 +229,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_libvpx_libvpx_intrinsics_ssse3_gyp
diff --git a/libvpx_intrinsics_ssse3.target.darwin-x86_64.mk b/libvpx_intrinsics_ssse3.target.darwin-x86_64.mk
index b3d0a68..09a2259 100644
--- a/libvpx_intrinsics_ssse3.target.darwin-x86_64.mk
+++ b/libvpx_intrinsics_ssse3.target.darwin-x86_64.mk
@@ -227,6 +227,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_libvpx_libvpx_intrinsics_ssse3_gyp
diff --git a/libvpx_intrinsics_ssse3.target.linux-x86.mk b/libvpx_intrinsics_ssse3.target.linux-x86.mk
index 20d3c48..5a69ff5 100644
--- a/libvpx_intrinsics_ssse3.target.linux-x86.mk
+++ b/libvpx_intrinsics_ssse3.target.linux-x86.mk
@@ -229,6 +229,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_libvpx_libvpx_intrinsics_ssse3_gyp
diff --git a/libvpx_intrinsics_ssse3.target.linux-x86_64.mk b/libvpx_intrinsics_ssse3.target.linux-x86_64.mk
index b3d0a68..09a2259 100644
--- a/libvpx_intrinsics_ssse3.target.linux-x86_64.mk
+++ b/libvpx_intrinsics_ssse3.target.linux-x86_64.mk
@@ -227,6 +227,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_libvpx_libvpx_intrinsics_ssse3_gyp
