diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-11-05 12:52:01 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-11-05 12:52:01 +0000 |
| commit | ebcf8e9e94deab913a6e6053deb834abae5d983c (patch) | |
| tree | 93e382e3f3bc787c5e36210c54ab38a688907718 /icuuc.host.linux-arm.mk | |
| parent | 8727b1c2dcbf19b4f3dddd17fb93fc15cae94869 (diff) | |
| download | icu-ebcf8e9e94deab913a6e6053deb834abae5d983c.tar.gz | |
Update makefiles after merge of Chromium at a2687e6f753c
This commit was generated by merge_from_chromium.py.
Change-Id: I7007045056c4b8a2d7e5ac06fb3d7f83cb92dced
Diffstat (limited to 'icuuc.host.linux-arm.mk')
| -rw-r--r-- | icuuc.host.linux-arm.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/icuuc.host.linux-arm.mk b/icuuc.host.linux-arm.mk index f7dcd91..74e2452 100644 --- a/icuuc.host.linux-arm.mk +++ b/icuuc.host.linux-arm.mk @@ -377,6 +377,7 @@ LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. ### Set directly by aosp_build_settings. +LOCAL_CXX_STL := libstdc++ LOCAL_CLANG := true # Add target alias to "gyp_all_modules" target. |