diff options
| author | 2014-07-18 14:57:04 -0700 | |
|---|---|---|
| committer | 2014-08-05 10:22:08 -0700 | |
| commit | 6e183f2e973a20f2eaca135c240908e1bf98c5d0 (patch) | |
| tree | 8a989eb8dbaca6a2c505569784740f9581fe7e98 /compiler/image_test.cc | |
| parent | eb76e11d836ea953b4e40a28e3e69d3b0f4c86fa (diff) | |
Make system use patchoat to relocate during runtime.
Change dalvik_system_DexFile.cc so that isDexOptNeededInternal will be
able to indicate that a patchoat is required. Change default of relocate
option to be on.
Bug: 15358152
Change-Id: Ibe92d8b55a24bbf718b0416a21b76e5df7a2de26
Diffstat (limited to 'compiler/image_test.cc')
| -rw-r--r-- | compiler/image_test.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/compiler/image_test.cc b/compiler/image_test.cc index 3005e56a9a..6b23345ebe 100644 --- a/compiler/image_test.cc +++ b/compiler/image_test.cc @@ -141,6 +141,8 @@ TEST_F(ImageTest, WriteRead) { std::string image("-Ximage:"); image.append(image_location.GetFilename()); options.push_back(std::make_pair(image.c_str(), reinterpret_cast<void*>(NULL))); + // By default the compiler this creates will not include patch information. + options.push_back(std::make_pair("-Xnorelocate", nullptr)); if (!Runtime::Create(options, false)) { LOG(FATAL) << "Failed to create runtime"; |