diff options
| author | Alex Light <allight@google.com> | 2014-07-18 14:57:04 -0700 |
|---|---|---|
| committer | Alex Light <allight@google.com> | 2014-08-05 10:22:08 -0700 |
| commit | 6e183f2e973a20f2eaca135c240908e1bf98c5d0 (patch) | |
| tree | 8a989eb8dbaca6a2c505569784740f9581fe7e98 /runtime/utils_test.cc | |
| parent | eb76e11d836ea953b4e40a28e3e69d3b0f4c86fa (diff) | |
| download | art-6e183f2e973a20f2eaca135c240908e1bf98c5d0.tar.gz art-6e183f2e973a20f2eaca135c240908e1bf98c5d0.tar.bz2 art-6e183f2e973a20f2eaca135c240908e1bf98c5d0.zip | |
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 'runtime/utils_test.cc')
| -rw-r--r-- | runtime/utils_test.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/runtime/utils_test.cc b/runtime/utils_test.cc index 7cd5980c44..d6c90e1d45 100644 --- a/runtime/utils_test.cc +++ b/runtime/utils_test.cc @@ -350,6 +350,8 @@ TEST_F(UtilsTest, GetDalvikCacheFilenameOrDie) { GetDalvikCacheFilenameOrDie("/system/framework/core.jar", "/foo").c_str()); EXPECT_STREQ("/foo/system@framework@boot.art", GetDalvikCacheFilenameOrDie("/system/framework/boot.art", "/foo").c_str()); + EXPECT_STREQ("/foo/system@framework@boot.oat", + GetDalvikCacheFilenameOrDie("/system/framework/boot.oat", "/foo").c_str()); } TEST_F(UtilsTest, GetSystemImageFilename) { |