diff options
| author | Andreas Gampe <agampe@google.com> | 2015-03-27 23:45:15 -0700 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2015-03-27 23:46:09 -0700 |
| commit | 4585f876eb5dfb936bd0d6cb6acd78a1f2182ba6 (patch) | |
| tree | e9dfed086f56245e74862caa813c708bc4f500f9 /dex2oat | |
| parent | e2c29f4a2717923f190c944a06e02f7d8c3ddcb6 (diff) | |
| download | art-4585f876eb5dfb936bd0d6cb6acd78a1f2182ba6.zip art-4585f876eb5dfb936bd0d6cb6acd78a1f2182ba6.tar.gz art-4585f876eb5dfb936bd0d6cb6acd78a1f2182ba6.tar.bz2 | |
ART: Some runtime cleanup
Use an enum for the compiler-callback mode.
Refactor and remove some unnecessary includes in runtime.h.
Change-Id: If2245fa470171311b8e05b677cf6bb28f209585a
Diffstat (limited to 'dex2oat')
| -rw-r--r-- | dex2oat/dex2oat.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/dex2oat/dex2oat.cc b/dex2oat/dex2oat.cc index f1cd30a..2e1b7ae 100644 --- a/dex2oat/dex2oat.cc +++ b/dex2oat/dex2oat.cc @@ -1053,9 +1053,12 @@ class Dex2Oat FINAL { } verification_results_.reset(new VerificationResults(compiler_options_.get())); - callbacks_.reset(new QuickCompilerCallbacks(verification_results_.get(), - &method_inliner_map_, - image_)); + callbacks_.reset(new QuickCompilerCallbacks( + verification_results_.get(), + &method_inliner_map_, + image_ ? + CompilerCallbacks::CallbackMode::kCompileBootImage : + CompilerCallbacks::CallbackMode::kCompileApp)); runtime_options.push_back(std::make_pair("compilercallbacks", callbacks_.get())); runtime_options.push_back( std::make_pair("imageinstructionset", GetInstructionSetString(instruction_set_))); |