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
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 @@
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 @@
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)
diff --git a/src/compiler.cc b/src/compiler.cc
index 98d8fac..e54dd89 100644
--- a/src/compiler.cc
+++ b/src/compiler.cc
@@ -25,7 +25,6 @@
#include "class_linker.h"
#include "class_loader.h"
#include "dex_cache.h"
-#include "jni_compiler.h"
#include "jni_internal.h"
#include "oat_compilation_unit.h"
#include "oat_file.h"
@@ -34,6 +33,10 @@
#include "stl_util.h"
#include "timing_logger.h"
+#if !defined(ART_USE_LLVM_COMPILER)
+#include "jni_compiler.h"
+#endif
+
#if defined(ART_USE_LLVM_COMPILER)
#include "compiler_llvm/compiler_llvm.h"
#endif
@@ -220,7 +223,9 @@
Compiler::Compiler(InstructionSet instruction_set, bool image, size_t thread_count,
bool support_debugging, const std::set<std::string>* image_classes)
: instruction_set_(instruction_set),
+#if !defined(ART_USE_LLVM_COMPILER)
jni_compiler_(instruction_set),
+#endif
compiled_classes_lock_("compiled classes lock"),
compiled_methods_lock_("compiled method lock"),
compiled_invoke_stubs_lock_("compiled invoke stubs lock"),
diff --git a/src/compiler.h b/src/compiler.h
index 476a744..639ab4f 100644
--- a/src/compiler.h
+++ b/src/compiler.h
@@ -26,11 +26,14 @@
#include "constants.h"
#include "dex_cache.h"
#include "dex_file.h"
-#include "jni_compiler.h"
#include "oat_file.h"
#include "object.h"
#include "runtime.h"
+#if !defined(ART_USE_LLVM_COMPILER)
+#include "jni_compiler.h"
+#endif
+
#if defined(ART_USE_LLVM_COMPILER)
#include "compiler_llvm/compiler_llvm.h"
#endif
@@ -170,7 +173,9 @@
const CompiledInvokeStub* compiled_invoke_stub);
InstructionSet instruction_set_;
+#if !defined(ART_USE_LLVM_COMPILER)
JniCompiler jni_compiler_;
+#endif
typedef std::map<const ClassReference, CompiledClass*> ClassTable;
// All class references that this compiler has compiled
