summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorLogan Chien <loganchien@google.com>2012-03-06 18:24:03 +0800
committerShih-wei Liao <sliao@google.com>2012-03-06 14:38:23 -0800
commit9787ac4a18e71a57ed2b559759e9903b557a65dd (patch)
tree57f673ba508c0fea41b9a231866ecd4b47f42adf /build
parentbc615a1d16969196168d5d4632f2cb1aa8b6664b (diff)
downloadart-9787ac4a18e71a57ed2b559759e9903b557a65dd.zip
art-9787ac4a18e71a57ed2b559759e9903b557a65dd.tar.gz
art-9787ac4a18e71a57ed2b559759e9903b557a65dd.tar.bz2
Skip src/jni_compiler.cc from llvm backend
LLVM backend has llvm-specific JNI compiler, which is using different calling convention and being incompatible with src/jni_compiler.cc, thus we are not using src/jni_compiler.cc in the llvm backend. Change-Id: I68a3beb2668b4bcc8ed36aed57fa252907ad2453
Diffstat (limited to 'build')
-rw-r--r--build/Android.common.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/build/Android.common.mk b/build/Android.common.mk
index 0dcfd82..1ba92ab 100644
--- a/build/Android.common.mk
+++ b/build/Android.common.mk
@@ -184,7 +184,6 @@ LIBART_COMMON_SRC_FILES := \
src/jdwp/jdwp_handler.cc \
src/jdwp/jdwp_main.cc \
src/jdwp/jdwp_socket.cc \
- src/jni_compiler.cc \
src/jni_internal.cc \
src/logging.cc \
src/mark_stack.cc \
@@ -246,6 +245,7 @@ LIBART_COMMON_SRC_FILES += \
src/compiler/SSATransformation.cc \
src/compiler/Utility.cc \
src/compiler/codegen/RallocUtil.cc \
+ src/jni_compiler.cc \
src/jni_internal_arm.cc \
src/jni_internal_x86.cc
ifeq ($(ART_MIPS_TARGET),true)