aboutsummaryrefslogtreecommitdiff
path: root/icuuc.host.linux-mips.mk
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-10-09 19:21:24 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-10-09 19:21:24 +0000
commit662bb3021503d24f4645fbb17d81b2ab04d33c0f (patch)
tree35ebe5f6be5e6c7cf931e9ca9bf40086c784c9af /icuuc.host.linux-mips.mk
parent9953d42e77722514684ed7e7c7312633125f3b48 (diff)
downloadicu-662bb3021503d24f4645fbb17d81b2ab04d33c0f.tar.gz
Update makefiles after merge of Chromium at 89cfb59e11ed
This commit was generated by merge_from_chromium.py. Change-Id: I4f17dc3eaf0a1cfd0af1db521a236169648c0608
Diffstat (limited to 'icuuc.host.linux-mips.mk')
-rw-r--r--icuuc.host.linux-mips.mk3
1 files changed, 3 insertions, 0 deletions
diff --git a/icuuc.host.linux-mips.mk b/icuuc.host.linux-mips.mk
index 3fd7baa..f53e257 100644
--- a/icuuc.host.linux-mips.mk
+++ b/icuuc.host.linux-mips.mk
@@ -372,6 +372,9 @@ LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CO
LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := true
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_icu_icuuc_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp