diff options
| author | Shih-wei Liao <sliao@google.com> | 2012-02-23 23:48:21 -0800 |
|---|---|---|
| committer | Shih-wei Liao <sliao@google.com> | 2012-03-01 11:44:02 -0800 |
| commit | 5b8b1edc803a85bb3172560826d6a23fb23c3452 (patch) | |
| tree | 43fe7644011ad6b8c7175ee9748f5fd27e0d27af /build | |
| parent | 31a4a6f5717f645da6b97ccc1e420ae1e1c71ce0 (diff) | |
| download | art-5b8b1edc803a85bb3172560826d6a23fb23c3452.zip art-5b8b1edc803a85bb3172560826d6a23fb23c3452.tar.gz art-5b8b1edc803a85bb3172560826d6a23fb23c3452.tar.bz2 | |
Implement Link-loading and pass 62 tests in JniInternalTest.
The passed tests include the 12 originally ARM-only tests. Now it works
on x86 as well if defined(ART_USE_LLVM_COMPILER).
Change-Id: I03092637fa4f0979ca77e0cac06e5d31a867e465
Diffstat (limited to 'build')
| -rw-r--r-- | build/Android.gtest.mk | 7 | ||||
| -rw-r--r-- | build/Android.libart.mk | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk index 4d2fae8..c44a5e3 100644 --- a/build/Android.gtest.mk +++ b/build/Android.gtest.mk @@ -50,6 +50,11 @@ define build-art-test LOCAL_SHARED_LIBRARIES += libdynamic_annotations-host endif + ifeq ($(ART_USE_LLVM_COMPILER),true) + LOCAL_C_INCLUDES += frameworks/compile/linkloader + LOCAL_STATIC_LIBRARIES += librsloader libcutils + endif + # Mac OS linker doesn't understand --export-dynamic. ifneq ($(HOST_OS)-$$(art_target_or_host),darwin-host) # Allow jni_compiler_test to find Java_MyClass_bar within itself using dlopen(NULL, ...). @@ -59,7 +64,7 @@ define build-art-test ifeq ($$(art_target_or_host),target) LOCAL_CFLAGS := $(ART_TARGET_CFLAGS) $(ART_TARGET_DEBUG_CFLAGS) LOCAL_SHARED_LIBRARIES += libdl libicuuc libicui18n libnativehelper libstlport libz - LOCAL_STATIC_LIBRARIES := libgtest libgtest_main + LOCAL_STATIC_LIBRARIES += libgtest libgtest_main LOCAL_MODULE_PATH := $(ART_NATIVETEST_OUT) include $(BUILD_EXECUTABLE) art_gtest_exe := $$(LOCAL_MODULE_PATH)/$$(LOCAL_MODULE) diff --git a/build/Android.libart.mk b/build/Android.libart.mk index b049ad9..f6aac09 100644 --- a/build/Android.libart.mk +++ b/build/Android.libart.mk @@ -71,6 +71,7 @@ define build-libart endif LOCAL_C_INCLUDES += $(ART_C_INCLUDES) ifeq ($(ART_USE_LLVM_COMPILER),true) + LOCAL_C_INCLUDES += frameworks/compile/linkloader libart_arm_STATIC_LIBRARIES := \ libLLVMARMInfo \ libLLVMARMDisassembler \ @@ -122,7 +123,8 @@ define build-libart libLLVMMC \ libLLVMMCParser \ libLLVMCore \ - libLLVMSupport + libLLVMSupport \ + librsloader endif LOCAL_SHARED_LIBRARIES := liblog libnativehelper ifeq ($$(art_target_or_host),target) |