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
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 @@
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 @@
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)