Update makefiles after merge of Chromium at 6e9c84566c9f

This commit was generated by merge_from_chromium.py.

Change-Id: Iab59b3864b3beb060f8a0dc42baafd81c5652331

12 files changed, 36 insertions, 0 deletions

diff --git a/dl/openmax_dl.target.darwin-arm.mk b/dl/openmax_dl.target.darwin-arm.mk
index d3891d9..4e08771 100644
--- a/dl/openmax_dl.target.darwin-arm.mk
+++ b/dl/openmax_dl.target.darwin-arm.mk
@@ -294,6 +294,9 @@ LOCAL_SHARED_LIBRARIES := \
 	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_openmax_dl_dl_openmax_dl_gyp
diff --git a/dl/openmax_dl.target.darwin-arm64.mk b/dl/openmax_dl.target.darwin-arm64.mk
index c1f3afe..7562362 100644
--- a/dl/openmax_dl.target.darwin-arm64.mk
+++ b/dl/openmax_dl.target.darwin-arm64.mk
@@ -234,6 +234,9 @@ LOCAL_SHARED_LIBRARIES := \
 	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_openmax_dl_dl_openmax_dl_gyp
diff --git a/dl/openmax_dl.target.darwin-mips.mk b/dl/openmax_dl.target.darwin-mips.mk
index d4bd75c..479fed5 100644
--- a/dl/openmax_dl.target.darwin-mips.mk
+++ b/dl/openmax_dl.target.darwin-mips.mk
@@ -232,6 +232,9 @@ LOCAL_SHARED_LIBRARIES := \
 	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_openmax_dl_dl_openmax_dl_gyp
diff --git a/dl/openmax_dl.target.darwin-x86.mk b/dl/openmax_dl.target.darwin-x86.mk
index 87b1100..72fd3c8 100644
--- a/dl/openmax_dl.target.darwin-x86.mk
+++ b/dl/openmax_dl.target.darwin-x86.mk
@@ -252,6 +252,9 @@ LOCAL_SHARED_LIBRARIES := \
 	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_openmax_dl_dl_openmax_dl_gyp
diff --git a/dl/openmax_dl.target.darwin-x86_64.mk b/dl/openmax_dl.target.darwin-x86_64.mk
index 8ea713b..ccf9ec3 100644
--- a/dl/openmax_dl.target.darwin-x86_64.mk
+++ b/dl/openmax_dl.target.darwin-x86_64.mk
@@ -250,6 +250,9 @@ LOCAL_SHARED_LIBRARIES := \
 	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_openmax_dl_dl_openmax_dl_gyp
diff --git a/dl/openmax_dl.target.linux-arm.mk b/dl/openmax_dl.target.linux-arm.mk
index d3891d9..4e08771 100644
--- a/dl/openmax_dl.target.linux-arm.mk
+++ b/dl/openmax_dl.target.linux-arm.mk
@@ -294,6 +294,9 @@ LOCAL_SHARED_LIBRARIES := \
 	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_openmax_dl_dl_openmax_dl_gyp
diff --git a/dl/openmax_dl.target.linux-arm64.mk b/dl/openmax_dl.target.linux-arm64.mk
index c1f3afe..7562362 100644
--- a/dl/openmax_dl.target.linux-arm64.mk
+++ b/dl/openmax_dl.target.linux-arm64.mk
@@ -234,6 +234,9 @@ LOCAL_SHARED_LIBRARIES := \
 	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_openmax_dl_dl_openmax_dl_gyp
diff --git a/dl/openmax_dl.target.linux-mips.mk b/dl/openmax_dl.target.linux-mips.mk
index d4bd75c..479fed5 100644
--- a/dl/openmax_dl.target.linux-mips.mk
+++ b/dl/openmax_dl.target.linux-mips.mk
@@ -232,6 +232,9 @@ LOCAL_SHARED_LIBRARIES := \
 	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_openmax_dl_dl_openmax_dl_gyp
diff --git a/dl/openmax_dl.target.linux-x86.mk b/dl/openmax_dl.target.linux-x86.mk
index 87b1100..72fd3c8 100644
--- a/dl/openmax_dl.target.linux-x86.mk
+++ b/dl/openmax_dl.target.linux-x86.mk
@@ -252,6 +252,9 @@ LOCAL_SHARED_LIBRARIES := \
 	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_openmax_dl_dl_openmax_dl_gyp
diff --git a/dl/openmax_dl.target.linux-x86_64.mk b/dl/openmax_dl.target.linux-x86_64.mk
index 8ea713b..ccf9ec3 100644
--- a/dl/openmax_dl.target.linux-x86_64.mk
+++ b/dl/openmax_dl.target.linux-x86_64.mk
@@ -250,6 +250,9 @@ LOCAL_SHARED_LIBRARIES := \
 	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_openmax_dl_dl_openmax_dl_gyp
diff --git a/dl/openmax_dl_armv7.target.darwin-arm.mk b/dl/openmax_dl_armv7.target.darwin-arm.mk
index ce2eed7..c1278f3 100644
--- a/dl/openmax_dl_armv7.target.darwin-arm.mk
+++ b/dl/openmax_dl_armv7.target.darwin-arm.mk
@@ -251,6 +251,9 @@ LOCAL_SHARED_LIBRARIES := \
 	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_openmax_dl_dl_openmax_dl_armv7_gyp
diff --git a/dl/openmax_dl_armv7.target.linux-arm.mk b/dl/openmax_dl_armv7.target.linux-arm.mk
index ce2eed7..c1278f3 100644
--- a/dl/openmax_dl_armv7.target.linux-arm.mk
+++ b/dl/openmax_dl_armv7.target.linux-arm.mk
@@ -251,6 +251,9 @@ LOCAL_SHARED_LIBRARIES := \
 	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_openmax_dl_dl_openmax_dl_armv7_gyp