diff options
| author | Elliott Hughes <enh@google.com> | 2012-05-03 17:21:04 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2012-05-04 15:41:48 -0700 |
| commit | 7cd6760f7045d771faae8080a8c6150bf678f679 (patch) | |
| tree | d172fbe065d2ac0c781b6eaee968ced48fb53ce0 /NativeCode.mk | |
| parent | 88f3ec9ebfd60998eb321f8c182009dace9bf983 (diff) | |
| download | libcore-7cd6760f7045d771faae8080a8c6150bf678f679.zip libcore-7cd6760f7045d771faae8080a8c6150bf678f679.tar.gz libcore-7cd6760f7045d771faae8080a8c6150bf678f679.tar.bz2 | |
Make libjavacore independent of libnativehelper for the PDK.
Bug: 6369821
Change-Id: Ie038571a5dac1f301c0c3c6fb84df432e67b62c0
Diffstat (limited to 'NativeCode.mk')
| -rw-r--r-- | NativeCode.mk | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/NativeCode.mk b/NativeCode.mk index bee4658..2a222b1 100644 --- a/NativeCode.mk +++ b/NativeCode.mk @@ -87,7 +87,7 @@ endif # Define the rules. LOCAL_SRC_FILES := $(core_src_files) LOCAL_C_INCLUDES := $(core_c_includes) -LOCAL_SHARED_LIBRARIES := $(core_shared_libraries) +LOCAL_SHARED_LIBRARIES := $(core_shared_libraries) libexpat libicuuc libicui18n libssl libcrypto libz libnativehelper LOCAL_STATIC_LIBRARIES := $(core_static_libraries) LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libjavacore @@ -95,7 +95,7 @@ LOCAL_MODULE := libjavacore LOCAL_C_INCLUDES += external/stlport/stlport bionic/ bionic/libstdc++/include LOCAL_SHARED_LIBRARIES += libstlport -include $(BUILD_STATIC_LIBRARY) +include $(BUILD_SHARED_LIBRARY) # # Build for the host. @@ -106,9 +106,12 @@ ifeq ($(WITH_HOST_DALVIK),true) # Define the rules. LOCAL_SRC_FILES := $(core_src_files) LOCAL_CFLAGS += $(core_cflags) - LOCAL_CPPFLAGS += $(core_cppflags) LOCAL_C_INCLUDES := $(core_c_includes) + LOCAL_CPPFLAGS += $(core_cppflags) + LOCAL_LDLIBS += -ldl -lpthread LOCAL_MODULE_TAGS := optional - LOCAL_MODULE := libjavacore-host - include $(BUILD_HOST_STATIC_LIBRARY) + LOCAL_MODULE := libjavacore + LOCAL_SHARED_LIBRARIES := $(core_shared_libraries) libexpat libicuuc libicui18n libssl libcrypto libz-host + LOCAL_STATIC_LIBRARIES := $(core_static_libraries) + include $(BUILD_HOST_SHARED_LIBRARY) endif |