summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Gampe <agampe@google.com>2015-03-11 09:53:50 -0700
committerAndreas Gampe <agampe@google.com>2015-03-11 10:01:29 -0700
commit9b5cba401aae6d34450112bdcf9bab5e19da90f2 (patch)
tree2e92174271b1a33cc7bd8822d7bdfa8e75cf3c73
parent1b4902086744563ba75b076b768b2609b59f9203 (diff)
downloadandroid_art-9b5cba401aae6d34450112bdcf9bab5e19da90f2.tar.gz
android_art-9b5cba401aae6d34450112bdcf9bab5e19da90f2.tar.bz2
android_art-9b5cba401aae6d34450112bdcf9bab5e19da90f2.zip
ART: Missing include
Fix missing include. Change-Id: I439bdf3a5c7dc2a710f3dfa0dca494ac3698de60
-rw-r--r--runtime/common_runtime_test.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/runtime/common_runtime_test.cc b/runtime/common_runtime_test.cc
index c7cee4708b..84865973c6 100644
--- a/runtime/common_runtime_test.cc
+++ b/runtime/common_runtime_test.cc
@@ -34,6 +34,7 @@
#include "gc_root-inl.h"
#include "gc/heap.h"
#include "gtest/gtest.h"
+#include "interpreter/unstarted_runtime.h"
#include "jni_internal.h"
#include "mirror/class_loader.h"
#include "mem_map.h"
@@ -108,6 +109,8 @@ void ScratchFile::Unlink() {
CHECK_EQ(0, unlink_result);
}
+static bool unstarted_initialized_ = false;
+
CommonRuntimeTest::CommonRuntimeTest() {}
CommonRuntimeTest::~CommonRuntimeTest() {
// Ensure the dex files are cleaned up before the runtime.
@@ -239,7 +242,10 @@ void CommonRuntimeTest::SetUp() {
// Initialize maps for unstarted runtime. This needs to be here, as running clinits needs this
// set up.
- interpreter::UnstartedRuntimeInitialize();
+ if (!unstarted_initialized_) {
+ interpreter::UnstartedRuntimeInitialize();
+ unstarted_initialized_ = true;
+ }
class_linker_->RunRootClinits();
boot_class_path_ = class_linker_->GetBootClassPath();