diff options
Diffstat (limited to 'compiler/image_test.cc')
| -rw-r--r-- | compiler/image_test.cc | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/compiler/image_test.cc b/compiler/image_test.cc index 9bbe595fa9..b0225a3625 100644 --- a/compiler/image_test.cc +++ b/compiler/image_test.cc @@ -20,10 +20,14 @@ #include <string> #include <vector> +#include "android-base/stringprintf.h" + #include "base/unix_file/fd_file.h" #include "class_linker-inl.h" +#include "compiler_callbacks.h" #include "common_compiler_test.h" #include "debug/method_debug_info.h" +#include "dex/quick_compiler_callbacks.h" #include "driver/compiler_options.h" #include "elf_writer.h" #include "elf_writer_quick.h" @@ -74,6 +78,14 @@ class ImageTest : public CommonCompilerTest { const std::string& extra_dex = "", const std::string& image_class = ""); + void SetUpRuntimeOptions(RuntimeOptions* options) OVERRIDE { + CommonCompilerTest::SetUpRuntimeOptions(options); + callbacks_.reset(new QuickCompilerCallbacks( + verification_results_.get(), + CompilerCallbacks::CallbackMode::kCompileBootImage)); + options->push_back(std::make_pair("compilercallbacks", callbacks_.get())); + } + std::unordered_set<std::string>* GetImageClasses() OVERRIDE { return new std::unordered_set<std::string>(image_classes_); } @@ -134,7 +146,8 @@ void CompilationHelper::Compile(CompilerDriver* driver, // Create a generic tmp file, to be the base of the .art and .oat temporary files. ScratchFile location; for (int i = 0; i < static_cast<int>(class_path.size()); ++i) { - std::string cur_location(StringPrintf("%s-%d.art", location.GetFilename().c_str(), i)); + std::string cur_location = + android::base::StringPrintf("%s-%d.art", location.GetFilename().c_str(), i); image_locations.push_back(ScratchFile(cur_location)); } } @@ -241,6 +254,7 @@ void CompilationHelper::Compile(CompilerDriver* driver, driver->GetInstructionSetFeatures(), &key_value_store, /* verify */ false, // Dex files may be dex-to-dex-ed, don't verify. + /* update_input_vdex */ false, &cur_opened_dex_files_map, &cur_opened_dex_files); ASSERT_TRUE(dex_files_ok); |