diff options
| author | Hiroshi Yamauchi <yamauchi@google.com> | 2015-04-03 21:06:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-03 21:06:51 +0000 |
| commit | 9ba48cef58e71f6a61b346d83c69c6372ede6b77 (patch) | |
| tree | aa81defca9c6cc2c736e9b19e477240d18867225 | |
| parent | 425587d25832145a45a0b76beaa93996b0226f0d (diff) | |
| parent | 02d2f290380c6aeff5f5a089ee38fa5d55e46130 (diff) | |
| download | android_art-9ba48cef58e71f6a61b346d83c69c6372ede6b77.tar.gz android_art-9ba48cef58e71f6a61b346d83c69c6372ede6b77.tar.bz2 android_art-9ba48cef58e71f6a61b346d83c69c6372ede6b77.zip | |
Merge "Fix the read barrier builds."
| -rw-r--r-- | runtime/jni_internal.cc | 2 | ||||
| -rw-r--r-- | runtime/native/java_lang_Class.cc | 2 | ||||
| -rw-r--r-- | runtime/runtime.cc | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/runtime/jni_internal.cc b/runtime/jni_internal.cc index 5e38470584..9ec64d4b07 100644 --- a/runtime/jni_internal.cc +++ b/runtime/jni_internal.cc @@ -41,7 +41,7 @@ #include "mirror/art_method-inl.h" #include "mirror/class-inl.h" #include "mirror/class_loader.h" -#include "mirror/field.h" +#include "mirror/field-inl.h" #include "mirror/object-inl.h" #include "mirror/object_array-inl.h" #include "mirror/string-inl.h" diff --git a/runtime/native/java_lang_Class.cc b/runtime/native/java_lang_Class.cc index 0ca9d24824..c893f0a6a0 100644 --- a/runtime/native/java_lang_Class.cc +++ b/runtime/native/java_lang_Class.cc @@ -24,7 +24,7 @@ #include "mirror/art_field-inl.h" #include "mirror/class-inl.h" #include "mirror/class_loader.h" -#include "mirror/field.h" +#include "mirror/field-inl.h" #include "mirror/object-inl.h" #include "mirror/object_array-inl.h" #include "mirror/string-inl.h" diff --git a/runtime/runtime.cc b/runtime/runtime.cc index 42673d19a8..497123bf28 100644 --- a/runtime/runtime.cc +++ b/runtime/runtime.cc @@ -1671,6 +1671,10 @@ void Runtime::UpdateProfilerState(int state) { void Runtime::CreateJit() { CHECK(!IsAotCompiler()); + if (GetInstrumentation()->IsForcedInterpretOnly()) { + // Don't create JIT if forced interpret only. + return; + } std::string error_msg; jit_.reset(jit::Jit::Create(jit_options_.get(), &error_msg)); if (jit_.get() != nullptr) { |