diff options
| author | Elliott Hughes <enh@google.com> | 2014-05-07 16:09:26 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2014-05-07 16:09:26 -0700 |
| commit | df36ba57877a085f51453595773c6360338eb0be (patch) | |
| tree | 7df8b448110580822918aba86e9ac6dda2a77c94 | |
| parent | a456cc235b734a387a59ee9e1f92e435553631d2 (diff) | |
| download | icu4c-df36ba57877a085f51453595773c6360338eb0be.tar.gz | |
Don't factor out make variables that are only used once for the host.
Change-Id: I3a9ba9d3a30e6bf16afbe641524c86d1be6e29f8
| -rw-r--r-- | common/Android.mk | 4 | ||||
| -rw-r--r-- | i18n/Android.mk | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/common/Android.mk b/common/Android.mk index 880e414f..9406834d 100644 --- a/common/Android.mk +++ b/common/Android.mk @@ -137,8 +137,6 @@ local_cflags += -DU_COMMON_IMPLEMENTATION local_cflags += -O3 -fvisibility=hidden -local_ldlibs := -ldl -lm -lpthread - # # Build for the target (device). # @@ -167,7 +165,7 @@ ifeq ($(WITH_HOST_DALVIK),true) LOCAL_C_INCLUDES += $(c_includes) $(optional_android_logging_includes) LOCAL_CFLAGS += $(local_cflags) LOCAL_SHARED_LIBRARIES += $(optional_android_logging_libraries) - LOCAL_LDLIBS += $(local_ldlibs) + LOCAL_LDLIBS += -ldl -lm -lpthread LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libicuuc-host LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk diff --git a/i18n/Android.mk b/i18n/Android.mk index b5e6646c..61660d9a 100644 --- a/i18n/Android.mk +++ b/i18n/Android.mk @@ -113,8 +113,6 @@ local_cflags := -D_REENTRANT local_cflags += -DU_I18N_IMPLEMENTATION local_cflags += -O3 -fvisibility=hidden -local_ldlibs := -lpthread -lm - # # Build for the target (device). @@ -144,7 +142,7 @@ ifeq ($(WITH_HOST_DALVIK),true) LOCAL_C_INCLUDES += $(c_includes) $(optional_android_logging_includes) LOCAL_CFLAGS += $(local_cflags) LOCAL_SHARED_LIBRARIES += libicuuc-host $(optional_android_logging_libraries) - LOCAL_LDLIBS += $(local_ldlibs) + LOCAL_LDLIBS += -lm -lpthread LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libicui18n-host LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk |