summaryrefslogtreecommitdiffstats
path: root/patchoat
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 /patchoat
parent07b8441303ea82fca3cb85d71ecf8752d73cedd7 (diff)
downloadart-e63db27db913f1a88e2095a1ee8239b2bb9124e8.zip
art-e63db27db913f1a88e2095a1ee8239b2bb9124e8.tar.gz
art-e63db27db913f1a88e2095a1ee8239b2bb9124e8.tar.bz2
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 'patchoat')
-rw-r--r--patchoat/patchoat.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/patchoat/patchoat.cc b/patchoat/patchoat.cc
index dcf8c70..85b4e6d 100644
--- a/patchoat/patchoat.cc
+++ b/patchoat/patchoat.cc
@@ -26,6 +26,7 @@
#include "base/stringprintf.h"
#include "elf_utils.h"
#include "elf_file.h"
+#include "gc/space/image_space.h"
#include "image.h"
#include "instruction_set.h"
#include "mirror/art_field.h"
@@ -92,7 +93,7 @@ bool PatchOat::Patch(const std::string& image_location, off_t delta,
}
// Set up the runtime
- Runtime::Options options;
+ RuntimeOptions options;
NoopCompilerCallbacks callbacks;
options.push_back(std::make_pair("compilercallbacks", &callbacks));
std::string img = "-Ximage:" + image_location;
@@ -176,7 +177,7 @@ bool PatchOat::Patch(const File* input_oat, const std::string& image_location, o
}
// Set up the runtime
- Runtime::Options options;
+ RuntimeOptions options;
NoopCompilerCallbacks callbacks;
options.push_back(std::make_pair("compilercallbacks", &callbacks));
std::string img = "-Ximage:" + image_location;