diff options
Diffstat (limited to 'NativeCode.mk')
| -rw-r--r-- | NativeCode.mk | 48 |
1 files changed, 42 insertions, 6 deletions
diff --git a/NativeCode.mk b/NativeCode.mk index 0ae615e..910527c 100644 --- a/NativeCode.mk +++ b/NativeCode.mk @@ -67,11 +67,10 @@ core_c_includes := libcore/include $(LOCAL_C_INCLUDES) core_shared_libraries := $(LOCAL_SHARED_LIBRARIES) core_static_libraries := $(LOCAL_STATIC_LIBRARIES) core_cflags := $(LOCAL_CFLAGS) -Wall -Wextra -Werror -core_cppflags += -std=gnu++11 +core_cppflags += -std=gnu++11 -DU_USING_ICU_NAMESPACE=0 core_test_files := \ luni/src/test/native/dalvik_system_JniTest.cpp \ - luni/src/test/native/test_openssl_engine.cpp \ # # Build for the target (device). @@ -87,7 +86,7 @@ LOCAL_STATIC_LIBRARIES += $(core_static_libraries) libziparchive LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libjavacore LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/NativeCode.mk -include external/stlport/libstlport.mk +LOCAL_CXX_STL := libc++ include $(BUILD_SHARED_LIBRARY) # Test JNI library. @@ -97,21 +96,54 @@ include $(CLEAR_VARS) LOCAL_CFLAGS += $(core_cflags) LOCAL_CPPFLAGS += $(core_cppflags) LOCAL_SRC_FILES += $(core_test_files) -LOCAL_C_INCLUDES += libcore/include external/openssl/include +LOCAL_C_INCLUDES += libcore/include LOCAL_SHARED_LIBRARIES += libcrypto LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libjavacoretests LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/NativeCode.mk -include external/stlport/libstlport.mk +LOCAL_CXX_STL := libc++ include $(BUILD_SHARED_LIBRARY) endif # LIBCORE_SKIP_TESTS +# Set of gtest unit tests. +include $(CLEAR_VARS) +LOCAL_CFLAGS += $(core_cflags) +LOCAL_CPPFLAGS += $(core_cppflags) +LOCAL_SRC_FILES += \ + luni/src/test/native/libcore_io_Memory_test.cpp \ + +LOCAL_C_INCLUDES += libcore/include +LOCAL_MODULE_TAGS := debug +LOCAL_MODULE := libjavacore-unit-tests +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/NativeCode.mk +LOCAL_CXX_STL := libc++ +include $(BUILD_NATIVE_TEST) + +# Set of benchmarks for libjavacore functions. +include $(CLEAR_VARS) +LOCAL_CFLAGS += $(core_cflags) +LOCAL_CPPFLAGS += $(core_cppflags) +LOCAL_SRC_FILES += \ + luni/src/benchmark/native/libcore_io_Memory_bench.cpp \ + +LOCAL_C_INCLUDES += libcore/include bionic/benchmarks +LOCAL_MODULE_TAGS := debug +LOCAL_MODULE := libjavacore-benchmarks +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/NativeCode.mk +LOCAL_CXX_STL := libc++ +LOCAL_MULTILIB := both +LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32 +LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64 +include $(BUILD_NATIVE_BENCHMARK) + # # Build for the host. # +ifeq ($(HOST_OS),linux) + include $(CLEAR_VARS) LOCAL_CLANG := true LOCAL_SRC_FILES += $(core_src_files) @@ -128,6 +160,7 @@ 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 LOCAL_MULTILIB := both +LOCAL_CXX_STL := libc++ include $(BUILD_HOST_SHARED_LIBRARY) ifeq ($(LIBCORE_SKIP_TESTS),) @@ -135,12 +168,15 @@ ifeq ($(LIBCORE_SKIP_TESTS),) LOCAL_CLANG := true LOCAL_SRC_FILES += $(core_test_files) LOCAL_CFLAGS += $(core_cflags) - LOCAL_C_INCLUDES += libcore/include external/openssl/include + LOCAL_C_INCLUDES += libcore/include LOCAL_CPPFLAGS += $(core_cppflags) LOCAL_LDLIBS += -ldl -lpthread LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libjavacoretests LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/NativeCode.mk LOCAL_SHARED_LIBRARIES := libcrypto-host + LOCAL_CXX_STL := libc++ include $(BUILD_HOST_SHARED_LIBRARY) endif # LIBCORE_SKIP_TESTS + +endif # HOST_OS == linux |