diff options
| author | Narayan Kamath <narayan@google.com> | 2014-12-09 11:16:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-12-09 11:16:30 +0000 |
| commit | 7c48c27143b7a8b3ca50ac7db66e4e2f1c3dbb2b (patch) | |
| tree | e74b77aa702f3b1c3ff33bfca5018f138237c622 | |
| parent | b75096eec64a4fed4940b626225ce94abc9bfc45 (diff) | |
| parent | 42fa66443db25e4d3121b647d9db4104b40343c1 (diff) | |
| download | sfntly-7c48c27143b7a8b3ca50ac7db66e4e2f1c3dbb2b.tar.gz | |
Merge "Remove hardcoded ICU include paths."android-wear-5.0.0_r1lollipop-wear-release
| -rw-r--r-- | Android.mk | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -134,8 +134,6 @@ MY_DEFS_Debug := \ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/cpp/src \ $(LOCAL_PATH) \ - external/icu/icu4c/source/common \ - external/icu/icu4c/source/i18n \ frameworks/wilhelm/include \ @@ -217,8 +215,6 @@ MY_DEFS_Release := \ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/cpp/src \ $(LOCAL_PATH) \ - external/icu/icu4c/source/common \ - external/icu/icu4c/source/i18n \ frameworks/wilhelm/include \ @@ -233,6 +229,8 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor \ -Wno-sign-promo +LOCAL_SHARED_LIBRARIES := libicuuc libicui18n + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) |