aboutsummaryrefslogtreecommitdiff
path: root/icuuc.target.linux-mips.mk
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-10-15 16:19:15 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-10-15 16:19:15 +0000
commite1a7ca3f56f481e776ef6bc91565821e0d685d7a (patch)
tree00058deb64a5e54b9fa13083a885080c4a93983e /icuuc.target.linux-mips.mk
parente6f1a85ad20546c7051e45b5cbfbd1467778f4ef (diff)
downloadicu-e1a7ca3f56f481e776ef6bc91565821e0d685d7a.tar.gz
Update makefiles after merge of Chromium at 6e9c84566c9f
This commit was generated by merge_from_chromium.py. Change-Id: I77e9481fee8371d84d0a3655c61d66168228432e
Diffstat (limited to 'icuuc.target.linux-mips.mk')
-rw-r--r--icuuc.target.linux-mips.mk3
1 files changed, 3 insertions, 0 deletions
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 @@ GYP_GENERATED_OUTPUTS := \
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