summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorLogan Chien <loganchien@google.com>2012-02-10 12:01:39 +0800
committerShih-wei Liao <sliao@google.com>2012-02-19 02:50:04 -0800
commitf04364f0ff789935d05490ee684f01c3de431780 (patch)
treea47070af79126f5aa315480280b7b44ba7205ef1 /build
parent7caf37e2aebdb9e6f10f691a8148dd3d3405f157 (diff)
downloadart-f04364f0ff789935d05490ee684f01c3de431780.zip
art-f04364f0ff789935d05490ee684f01c3de431780.tar.gz
art-f04364f0ff789935d05490ee684f01c3de431780.tar.bz2
Add upcall compiler.
Upcall compiler compiles the invoke stub for native-to-managed method invocation. Change-Id: I09fb1e4b3f166e8da5de73e8f39509cd9be6c152
Diffstat (limited to 'build')
-rw-r--r--build/Android.common.mk7
1 files changed, 4 insertions, 3 deletions
diff --git a/build/Android.common.mk b/build/Android.common.mk
index 8c16295..4bf0319 100644
--- a/build/Android.common.mk
+++ b/build/Android.common.mk
@@ -180,8 +180,6 @@ LIBART_COMMON_SRC_FILES := \
src/jdwp/jdwp_socket.cc \
src/jni_compiler.cc \
src/jni_internal.cc \
- src/jni_internal_arm.cc \
- src/jni_internal_x86.cc \
src/logging.cc \
src/mark_stack.cc \
src/mark_sweep.cc \
@@ -227,6 +225,7 @@ LIBART_COMMON_SRC_FILES += \
src/compiler_llvm/ir_builder.cc \
src/compiler_llvm/inferred_reg_category_map.cc \
src/compiler_llvm/method_compiler.cc \
+ src/compiler_llvm/upcall_compiler.cc \
src/compiler_llvm/utils_llvm.cc
else
LIBART_COMMON_SRC_FILES += \
@@ -241,7 +240,9 @@ LIBART_COMMON_SRC_FILES += \
src/compiler/codegen/arm/ArmRallocUtil.cc \
src/compiler/codegen/arm/Assemble.cc \
src/compiler/codegen/arm/LocalOptimizations.cc \
- src/compiler/codegen/arm/armv7-a/Codegen.cc
+ src/compiler/codegen/arm/armv7-a/Codegen.cc \
+ src/jni_internal_arm.cc \
+ src/jni_internal_x86.cc
endif
LIBART_TARGET_SRC_FILES := \