summaryrefslogtreecommitdiffstats
path: root/runtime/monitor_test.cc
diff options
context:
space:
mode:
authorIan Rogers <irogers@google.com>2014-07-15 15:36:11 -0700
committerIan Rogers <irogers@google.com>2014-07-15 17:07:49 -0700
commite63db27db913f1a88e2095a1ee8239b2bb9124e8 (patch)
tree893dee6783bca6717259321a6e4ba029c9c123e2 /runtime/monitor_test.cc
parent07b8441303ea82fca3cb85d71ecf8752d73cedd7 (diff)
downloadandroid_art-e63db27db913f1a88e2095a1ee8239b2bb9124e8.tar.gz
android_art-e63db27db913f1a88e2095a1ee8239b2bb9124e8.tar.bz2
android_art-e63db27db913f1a88e2095a1ee8239b2bb9124e8.zip
Break apart header files.
Create libart-gtest for common runtime and compiler gtest routines. Rename CompilerCallbacksImpl that is quick compiler specific. Rename trace clock source constants to not use the overloaded profiler term. Change-Id: I4aac4bdc7e7850c68335f81e59a390133b54e933
Diffstat (limited to 'runtime/monitor_test.cc')
-rw-r--r--runtime/monitor_test.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/runtime/monitor_test.cc b/runtime/monitor_test.cc
index bdba494e14..af24368e2f 100644
--- a/runtime/monitor_test.cc
+++ b/runtime/monitor_test.cc
@@ -24,6 +24,7 @@
#include "handle_scope-inl.h"
#include "mirror/class-inl.h"
#include "mirror/string-inl.h" // Strings are easiest to allocate
+#include "scoped_thread_state_change.h"
#include "thread_pool.h"
#include "utils.h"
@@ -31,7 +32,7 @@ namespace art {
class MonitorTest : public CommonRuntimeTest {
protected:
- void SetUpRuntimeOptions(Runtime::Options *options) OVERRIDE {
+ void SetUpRuntimeOptions(RuntimeOptions *options) OVERRIDE {
// Use a smaller heap
for (std::pair<std::string, const void*>& pair : *options) {
if (pair.first.find("-Xmx") == 0) {