diff options
| author | Ian Rogers <irogers@google.com> | 2014-07-15 15:36:11 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-07-15 17:07:49 -0700 |
| commit | e63db27db913f1a88e2095a1ee8239b2bb9124e8 (patch) | |
| tree | 893dee6783bca6717259321a6e4ba029c9c123e2 /dex2oat | |
| parent | 07b8441303ea82fca3cb85d71ecf8752d73cedd7 (diff) | |
| download | android_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 'dex2oat')
| -rw-r--r-- | dex2oat/dex2oat.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/dex2oat/dex2oat.cc b/dex2oat/dex2oat.cc index 0d40c8d209..3f2f925a02 100644 --- a/dex2oat/dex2oat.cc +++ b/dex2oat/dex2oat.cc @@ -40,7 +40,8 @@ #include "dex_file-inl.h" #include "dex/pass_driver_me_opts.h" #include "dex/verification_results.h" -#include "driver/compiler_callbacks_impl.h" +#include "dex/quick_compiler_callbacks.h" +#include "dex/quick/dex_file_to_method_inliner_map.h" #include "driver/compiler_driver.h" #include "driver/compiler_options.h" #include "elf_fixup.h" @@ -233,7 +234,7 @@ static void Usage(const char* fmt, ...) { class Dex2Oat { public: static bool Create(Dex2Oat** p_dex2oat, - const Runtime::Options& runtime_options, + const RuntimeOptions& runtime_options, const CompilerOptions& compiler_options, Compiler::Kind compiler_kind, InstructionSet instruction_set, @@ -460,7 +461,7 @@ class Dex2Oat { CHECK(method_inliner_map != nullptr); } - bool CreateRuntime(const Runtime::Options& runtime_options, InstructionSet instruction_set) + bool CreateRuntime(const RuntimeOptions& runtime_options, InstructionSet instruction_set) SHARED_TRYLOCK_FUNCTION(true, Locks::mutator_lock_) { if (!Runtime::Create(runtime_options, false)) { LOG(ERROR) << "Failed to create runtime"; @@ -1230,7 +1231,7 @@ static int dex2oat(int argc, char** argv) { timings.StartTiming("dex2oat Setup"); LOG(INFO) << CommandLine(); - Runtime::Options runtime_options; + RuntimeOptions runtime_options; std::vector<const DexFile*> boot_class_path; if (boot_image_option.empty()) { size_t failure_count = OpenDexFiles(dex_filenames, dex_locations, boot_class_path); @@ -1249,7 +1250,7 @@ static int dex2oat(int argc, char** argv) { std::unique_ptr<VerificationResults> verification_results(new VerificationResults( compiler_options.get())); DexFileToMethodInlinerMap method_inliner_map; - CompilerCallbacksImpl callbacks(verification_results.get(), &method_inliner_map); + QuickCompilerCallbacks callbacks(verification_results.get(), &method_inliner_map); runtime_options.push_back(std::make_pair("compilercallbacks", &callbacks)); runtime_options.push_back( std::make_pair("imageinstructionset", |