diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-10-19 22:50:10 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-10-19 22:50:10 +0000 |
| commit | 87edee97414c9694395b8e3564ee981d64ba088f (patch) | |
| tree | cd11b1ca78ff708a66e7e3cae13cfc4bda060906 /icudata.target.darwin-arm64.mk | |
| parent | 7469a2eed67253be56871524d076187462e6dda0 (diff) | |
| download | icu-87edee97414c9694395b8e3564ee981d64ba088f.tar.gz | |
Update makefiles after merge of Chromium at 89b463ddd92b
This commit was generated by merge_from_chromium.py.
Change-Id: Iac318046b85e13d5169b31aa9e6f50520c91c808
Diffstat (limited to 'icudata.target.darwin-arm64.mk')
| -rw-r--r-- | icudata.target.darwin-arm64.mk | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/icudata.target.darwin-arm64.mk b/icudata.target.darwin-arm64.mk index 0f4fe28..61f67e1 100644 --- a/icudata.target.darwin-arm64.mk +++ b/icudata.target.darwin-arm64.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_icu_icudata_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +LOCAL_SDK_VERSION := 19 gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) @@ -98,10 +99,7 @@ MY_DEFS_Debug := \ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/icu/source/common \ $(LOCAL_PATH)/third_party/icu/source/i18n \ - $(gyp_shared_intermediate_dir) \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(gyp_shared_intermediate_dir) # Flags passed to only C++ (and not C) files. @@ -191,10 +189,7 @@ MY_DEFS_Release := \ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/icu/source/common \ $(LOCAL_PATH)/third_party/icu/source/i18n \ - $(gyp_shared_intermediate_dir) \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(gyp_shared_intermediate_dir) # Flags passed to only C++ (and not C) files. @@ -217,13 +212,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. - -LOCAL_SHARED_LIBRARIES := \ - libstlport \ - libdl - ### Set directly by aosp_build_settings. LOCAL_CLANG := false +LOCAL_NDK_STL_VARIANT := stlport_static # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules |