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 /Android.mk | |
| parent | eb76e11d836ea953b4e40a28e3e69d3b0f4c86fa (diff) | |
| download | art-6e183f2e973a20f2eaca135c240908e1bf98c5d0.zip art-6e183f2e973a20f2eaca135c240908e1bf98c5d0.tar.gz art-6e183f2e973a20f2eaca135c240908e1bf98c5d0.tar.bz2 | |
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 'Android.mk')
| -rw-r--r-- | Android.mk | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -316,7 +316,8 @@ $$(OUT_OAT_FILE): $(PRODUCT_OUT)/$(1) $(DEFAULT_DEX_PREOPT_BUILT_IMAGE) $(DEX2OA --dex-location=/$(1) --oat-file=$$@ \ --instruction-set=$(DEX2OAT_TARGET_ARCH) \ --instruction-set-features=$(DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES) \ - --android-root=$(PRODUCT_OUT)/system --include-patch-information + --android-root=$(PRODUCT_OUT)/system --include-patch-information \ + --runtime-arg -Xnorelocate endif |