diff options
| author | Elliott Hughes <enh@google.com> | 2014-05-07 23:19:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-07 23:19:43 +0000 |
| commit | 197818f1ddf55947bfd8b69b398b06caa702e00b (patch) | |
| tree | 7df8b448110580822918aba86e9ac6dda2a77c94 | |
| parent | d057e411b36551dd1571dc49b358e109e1807faf (diff) | |
| parent | ca96fee299d32bee36d0d35ab02df70c81301736 (diff) | |
| download | icu4c-197818f1ddf55947bfd8b69b398b06caa702e00b.tar.gz | |
am ca96fee2: Merge "Don\'t factor out make variables that are only used once for the host."
* commit 'ca96fee299d32bee36d0d35ab02df70c81301736':
Don't factor out make variables that are only used once for the host.
| -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 |