diff options
| author | Ian Rogers <irogers@google.com> | 2014-05-23 15:12:42 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-06-09 20:39:00 -0700 |
| commit | 3deabd220cf7b1ca0824987e90b8ecc07087f05a (patch) | |
| tree | a737476c6d4125cdef0e99dba94bb992b076acb9 /NativeCode.mk | |
| parent | d6e67fd7082cf8c6ef5544dc740f9052add21538 (diff) | |
| download | libcore-3deabd220cf7b1ca0824987e90b8ecc07087f05a.zip libcore-3deabd220cf7b1ca0824987e90b8ecc07087f05a.tar.gz libcore-3deabd220cf7b1ca0824987e90b8ecc07087f05a.tar.bz2 | |
Remove deprecated WITH_HOST_DALVIK.
Bug: 13751317
Fix the Mac host build:
- conditionally define constants using pre-existing pattern,
- make Posix calls that the Mac doesn't support throw
UnsupportedOperationException.
Change-Id: Ib68887cbe36ab167d042eb96c7834bce0651b078
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 2a16598..5e149fd 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 |