diff options
| author | Ian Rogers <irogers@google.com> | 2014-06-11 19:26:04 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-11 19:26:04 +0000 |
| commit | e47efca0c45d284f372c5e5618c3b51bf2a07e29 (patch) | |
| tree | 0b3e62664cb7d7290f09c7894f1a643b800e892d /NativeCode.mk | |
| parent | 39dc3831f1d55522d25d30e6f41ccb865b6fad8d (diff) | |
| parent | a97fc53412f89f211433406d86e5674def6d3314 (diff) | |
| download | libcore-e47efca0c45d284f372c5e5618c3b51bf2a07e29.zip libcore-e47efca0c45d284f372c5e5618c3b51bf2a07e29.tar.gz libcore-e47efca0c45d284f372c5e5618c3b51bf2a07e29.tar.bz2 | |
am a97fc534: am a3f1cb68: Merge "Remove deprecated WITH_HOST_DALVIK."
* commit 'a97fc53412f89f211433406d86e5674def6d3314':
Remove deprecated WITH_HOST_DALVIK.
Diffstat (limited to 'NativeCode.mk')
| -rw-r--r-- | NativeCode.mk | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/NativeCode.mk b/NativeCode.mk index 05f4379..63e26c8 100644 --- a/NativeCode.mk +++ b/NativeCode.mk @@ -112,22 +112,21 @@ endif # LIBCORE_SKIP_TESTS # Build for the host. # -ifeq ($(WITH_HOST_DALVIK),true) - include $(CLEAR_VARS) - LOCAL_CLANG := true - LOCAL_SRC_FILES += $(core_src_files) - LOCAL_CFLAGS += $(core_cflags) - LOCAL_C_INCLUDES += $(core_c_includes) - LOCAL_CPPFLAGS += $(core_cppflags) - LOCAL_LDLIBS += -ldl -lpthread -lrt - LOCAL_MODULE_TAGS := optional - LOCAL_MODULE := libjavacore - LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/NativeCode.mk - LOCAL_SHARED_LIBRARIES += $(core_shared_libraries) libexpat-host libicuuc-host libicui18n-host libcrypto-host libz-host - LOCAL_STATIC_LIBRARIES += $(core_static_libraries) libziparchive-host libutils - include $(BUILD_HOST_SHARED_LIBRARY) +include $(CLEAR_VARS) +LOCAL_CLANG := true +LOCAL_SRC_FILES += $(core_src_files) +LOCAL_CFLAGS += $(core_cflags) +LOCAL_C_INCLUDES += $(core_c_includes) +LOCAL_CPPFLAGS += $(core_cppflags) +LOCAL_LDLIBS += -ldl -lpthread +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE := libjavacore +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/NativeCode.mk +LOCAL_SHARED_LIBRARIES += $(core_shared_libraries) libexpat-host libicuuc-host libicui18n-host libcrypto-host libz-host +LOCAL_STATIC_LIBRARIES += $(core_static_libraries) libziparchive-host libutils +include $(BUILD_HOST_SHARED_LIBRARY) - ifeq ($(LIBCORE_SKIP_TESTS),) +ifeq ($(LIBCORE_SKIP_TESTS),) include $(CLEAR_VARS) LOCAL_CLANG := true LOCAL_SRC_FILES += $(core_test_files) @@ -140,5 +139,4 @@ ifeq ($(WITH_HOST_DALVIK),true) LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/NativeCode.mk LOCAL_SHARED_LIBRARIES := libcrypto-host include $(BUILD_HOST_SHARED_LIBRARY) - endif # LIBCORE_SKIP_TESTS -endif +endif # LIBCORE_SKIP_TESTS |