diff options
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 65 |
1 files changed, 13 insertions, 52 deletions
@@ -15,31 +15,8 @@ LOCAL_PATH := $(call my-dir) -# -# Common definitions for host and device. -# - -src_files := \ - JNIHelp.cpp \ - Register.cpp - -c_includes := \ - $(JNI_H_INCLUDE) - -# Any shared/static libs required by libcore -# need to be mentioned here as well. -# TODO: fix this requirement - -shared_libraries := \ - libcrypto \ - libicui18n \ - libicuuc \ - libssl - -static_libraries := \ - libjavacore \ - libfdlibm - +local_src_files := \ + JNIHelp.cpp # @@ -47,14 +24,14 @@ static_libraries := \ # include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(src_files) -LOCAL_C_INCLUDES := $(c_includes) -LOCAL_STATIC_LIBRARIES := $(static_libraries) -LOCAL_SHARED_LIBRARIES := $(shared_libraries) libcutils libexpat liblog libstlport libz +LOCAL_SRC_FILES := $(local_src_files) +LOCAL_SHARED_LIBRARIES := liblog LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libnativehelper +LOCAL_C_INCLUDES := external/stlport/stlport bionic/ bionic/libstdc++/include +LOCAL_SHARED_LIBRARIES += libstlport + include $(BUILD_SHARED_LIBRARY) @@ -62,25 +39,9 @@ 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) - LOCAL_WHOLE_STATIC_LIBRARIES := $(static_libraries:%=%-host) - - ifeq ($(HOST_OS)-$(HOST_ARCH),darwin-x86) - # OSX has a lot of libraries built in, which we don't have to - # bother building; just include them on the ld line. - LOCAL_LDLIBS := -lexpat -lssl -lz -lcrypto -licucore - else - LOCAL_SHARED_LIBRARIES := $(shared_libraries) - LOCAL_STATIC_LIBRARIES := libcutils libexpat liblog libz - endif - - LOCAL_MODULE_TAGS := optional - LOCAL_MODULE := libnativehelper - include $(BUILD_HOST_STATIC_LIBRARY) - -endif +include $(CLEAR_VARS) +LOCAL_MODULE := libnativehelper +LOCAL_MODULE_TAGS := optional +LOCAL_SRC_FILES := $(local_src_files) +LOCAL_SHARED_LIBRARIES := liblog +include $(BUILD_HOST_SHARED_LIBRARY) |