diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-10-14 13:01:00 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-10-14 13:01:00 +0100 |
| commit | 940a78eab0548bbb43510f4bf5b99e601d67daab (patch) | |
| tree | e8d79381cdd59d3a6bf4516a8a5bd5b6121ea647 /icui18n.host.darwin-x86_64.mk | |
| parent | 56419111a2fdfa8fb2fd0a0e9c3acb79d29579c2 (diff) | |
| download | icu-940a78eab0548bbb43510f4bf5b99e601d67daab.tar.gz | |
Update makefiles after merge of Chromium at 39.0.2171.26
This commit was generated by merge_from_chromium.py.
Change-Id: I6bddf4a79bc732a94deccdb1b45da90a57c63548
Diffstat (limited to 'icui18n.host.darwin-x86_64.mk')
| -rw-r--r-- | icui18n.host.darwin-x86_64.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/icui18n.host.darwin-x86_64.mk b/icui18n.host.darwin-x86_64.mk index 0ca72a0..16ac1bd 100644 --- a/icui18n.host.darwin-x86_64.mk +++ b/icui18n.host.darwin-x86_64.mk @@ -373,6 +373,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_icui18n_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp |