Compile method one-by-one.
Change-Id: Ic56fb397f3bd6dee32372eb875261a3383eaf30c
diff --git a/build/Android.common.mk b/build/Android.common.mk
index c4f04be..74bc4a9 100644
--- a/build/Android.common.mk
+++ b/build/Android.common.mk
@@ -233,7 +233,6 @@
ifeq ($(ART_USE_LLVM_COMPILER),true)
LIBART_COMMON_SRC_FILES += \
- src/compiler_llvm/elf_loader.cc \
src/compiler_llvm/inferred_reg_category_map.cc \
src/compiler_llvm/procedure_linkage_table.cc \
src/compiler_llvm/runtime_support_llvm.cc
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index 9f75115..d090395 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -63,11 +63,6 @@
LOCAL_SHARED_LIBRARIES += libdynamic_annotations-host
endif
- ifeq ($(ART_USE_LLVM_COMPILER),true)
- LOCAL_C_INCLUDES += frameworks/compile/linkloader
- LOCAL_STATIC_LIBRARIES += librsloader
- 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_MyClassNatives_bar within itself using dlopen(NULL, ...).
diff --git a/build/Android.libart-compiler-llvm.mk b/build/Android.libart-compiler-llvm.mk
index e2c66e4..9ec356a 100644
--- a/build/Android.libart-compiler-llvm.mk
+++ b/build/Android.libart-compiler-llvm.mk
@@ -74,7 +74,7 @@
endif
LOCAL_C_INCLUDES += $(ART_C_INCLUDES)
- LOCAL_C_INCLUDES += frameworks/compile/linkloader
+
libart_compiler_llvm_arm_STATIC_LIBRARIES := \
libLLVMARMInfo \
libLLVMARMDisassembler \
@@ -111,6 +111,7 @@
endif
LOCAL_STATIC_LIBRARIES += \
+ libLLVMObject \
libLLVMLinker \
libLLVMipo \
libLLVMBitWriter \
@@ -129,8 +130,8 @@
libLLVMMC \
libLLVMMCParser \
libLLVMCore \
- libLLVMSupport \
- librsloader
+ libLLVMSupport
+
LOCAL_SHARED_LIBRARIES := liblog libnativehelper
LOCAL_SHARED_LIBRARIES += libcorkscrew # native stack trace support
ifeq ($$(art_target_or_host),target)
diff --git a/build/Android.libart.mk b/build/Android.libart.mk
index 01fa42b..9ccbe3f 100644
--- a/build/Android.libart.mk
+++ b/build/Android.libart.mk
@@ -98,13 +98,6 @@
endif
endif
LOCAL_C_INCLUDES += $(ART_C_INCLUDES)
- ifeq ($(ART_USE_LLVM_COMPILER),true)
- LOCAL_C_INCLUDES += frameworks/compile/linkloader
- LOCAL_STATIC_LIBRARIES += librsloader
- endif
- ifeq ($(ART_REQUIRE_LLVM),true)
- LOCAL_STATIC_LIBRARIES += libLLVMSupport
- endif
LOCAL_SHARED_LIBRARIES := liblog libnativehelper
LOCAL_SHARED_LIBRARIES += libcorkscrew # native stack trace support
ifeq ($$(art_target_or_host),target)