diff options
| author | Ian Rogers <irogers@google.com> | 2014-05-28 17:57:41 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-28 17:57:41 +0000 |
| commit | c1f7fd9d7d4bc8d6779881d6a2797410842a6269 (patch) | |
| tree | a16a1c2c2905a63435b414c5c85dd5585239f5d6 | |
| parent | 46a37854a86fb25fc9574b5b72234a4c8598a2be (diff) | |
| parent | e21592172d4bf87f14b1978c3557bf591d8d210d (diff) | |
| download | icu4c-c1f7fd9d7d4bc8d6779881d6a2797410842a6269.tar.gz | |
am e2159217: Merge "Remove deprecated WITH_HOST_DALVIK."
* commit 'e21592172d4bf87f14b1978c3557bf591d8d210d':
Remove deprecated WITH_HOST_DALVIK.
| -rw-r--r-- | common/Android.mk | 24 | ||||
| -rw-r--r-- | i18n/Android.mk | 22 |
2 files changed, 21 insertions, 25 deletions
diff --git a/common/Android.mk b/common/Android.mk index 9406834d..a9ebcdf7 100644 --- a/common/Android.mk +++ b/common/Android.mk @@ -159,19 +159,17 @@ include $(BUILD_SHARED_LIBRARY) # Build for the host. # -ifeq ($(WITH_HOST_DALVIK),true) - include $(CLEAR_VARS) - LOCAL_SRC_FILES += $(src_files) - LOCAL_C_INCLUDES += $(c_includes) $(optional_android_logging_includes) - LOCAL_CFLAGS += $(local_cflags) - LOCAL_SHARED_LIBRARIES += $(optional_android_logging_libraries) - LOCAL_LDLIBS += -ldl -lm -lpthread - LOCAL_MODULE_TAGS := optional - LOCAL_MODULE := libicuuc-host - LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk - LOCAL_REQUIRED_MODULES += icu-data-host - include $(BUILD_HOST_SHARED_LIBRARY) -endif +include $(CLEAR_VARS) +LOCAL_SRC_FILES += $(src_files) +LOCAL_C_INCLUDES += $(c_includes) $(optional_android_logging_includes) +LOCAL_CFLAGS += $(local_cflags) +LOCAL_SHARED_LIBRARIES += $(optional_android_logging_libraries) +LOCAL_LDLIBS += -ldl -lm -lpthread +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE := libicuuc-host +LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk +LOCAL_REQUIRED_MODULES += icu-data-host +include $(BUILD_HOST_SHARED_LIBRARY) # # Build as a static library against the NDK diff --git a/i18n/Android.mk b/i18n/Android.mk index 61660d9a..344fd47f 100644 --- a/i18n/Android.mk +++ b/i18n/Android.mk @@ -136,18 +136,16 @@ include $(BUILD_SHARED_LIBRARY) # Build for the host. # -ifeq ($(WITH_HOST_DALVIK),true) - include $(CLEAR_VARS) - LOCAL_SRC_FILES += $(src_files) - LOCAL_C_INCLUDES += $(c_includes) $(optional_android_logging_includes) - LOCAL_CFLAGS += $(local_cflags) - LOCAL_SHARED_LIBRARIES += libicuuc-host $(optional_android_logging_libraries) - LOCAL_LDLIBS += -lm -lpthread - LOCAL_MODULE_TAGS := optional - LOCAL_MODULE := libicui18n-host - LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk - include $(BUILD_HOST_SHARED_LIBRARY) -endif +include $(CLEAR_VARS) +LOCAL_SRC_FILES += $(src_files) +LOCAL_C_INCLUDES += $(c_includes) $(optional_android_logging_includes) +LOCAL_CFLAGS += $(local_cflags) +LOCAL_SHARED_LIBRARIES += libicuuc-host $(optional_android_logging_libraries) +LOCAL_LDLIBS += -lm -lpthread +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE := libicui18n-host +LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk +include $(BUILD_HOST_SHARED_LIBRARY) # # Build as a static library against the NDK |