diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-09-13 10:09:49 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-09-13 10:09:49 +0000 |
| commit | 81692763cc56da929a1b8687416bc612f977b04b (patch) | |
| tree | 768d02c19ae4168c37daf5cc2bb5d065ed77b11a /icudata.host.linux-arm.mk | |
| parent | 63cea03ec30f541dd4d27ee8b860b13ce7119a2f (diff) | |
| download | icu-81692763cc56da929a1b8687416bc612f977b04b.tar.gz | |
Update makefiles after merge of Chromium at 6a4d455b8650
This commit was generated by merge_from_chromium.py.
Change-Id: I1a604b2286a8a9488fa6d079eb903478f5a8d958
Diffstat (limited to 'icudata.host.linux-arm.mk')
| -rw-r--r-- | icudata.host.linux-arm.mk | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/icudata.host.linux-arm.mk b/icudata.host.linux-arm.mk index bf6b0b2..1610a00 100644 --- a/icudata.host.linux-arm.mk +++ b/icudata.host.linux-arm.mk @@ -5,7 +5,6 @@ include $(CLEAR_VARS) LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_icu_icudata_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp LOCAL_MODULE_SUFFIX := .a -LOCAL_MODULE_TAGS := optional LOCAL_IS_HOST_MODULE := true LOCAL_MULTILIB := $(GYP_HOST_MULTILIB) gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_HOST_VAR_PREFIX)) @@ -194,32 +193,6 @@ 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_LDFLAGS_Debug := \ - -Wl,-z,now \ - -Wl,-z,relro \ - -pthread \ - -fPIC \ - -m32 - - -LOCAL_LDFLAGS_Release := \ - -Wl,-z,now \ - -Wl,-z,relro \ - -pthread \ - -fPIC \ - -m32 - - -LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) - -LOCAL_STATIC_LIBRARIES := - -# Enable grouping to fix circular references -LOCAL_GROUP_STATIC_LIBRARIES := true - -LOCAL_SHARED_LIBRARIES := - # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules gyp_all_modules: third_party_icu_icudata_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp |