Make system use patchoat to relocate during runtime.

Change DexPreOpt to include patch information of all compiled files so
we can relocate at runtime.

Bug: 15358152

(cherry picked from commit ce090d3f45)

Change-Id: I75a1eec3a38d6bce1f678c510d57849f8dfa04fa
This commit is contained in:
Alex Light 2014-07-24 16:26:13 -07:00 committed by Brian Carlstrom
parent f15ad97a07
commit c6b7676719
3 changed files with 5 additions and 3 deletions

View File

@ -90,5 +90,6 @@ $(hide) $(DEX2OATD) \
--oat-file=$(2) \
--android-root=$(PRODUCT_OUT)/system \
--instruction-set=$($(PRIVATE_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_ARCH) \
--instruction-set-features=$($(PRIVATE_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES)
--instruction-set-features=$($(PRIVATE_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES) \
--include-patch-information --runtime-arg -Xnorelocate
endef

View File

@ -53,4 +53,4 @@ $($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME) : $(LIBART_TARGE
--image=$@ --base=$(LIBART_IMG_TARGET_BASE_ADDRESS) \
--instruction-set=$($(PRIVATE_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_ARCH) \
--instruction-set-features=$($(PRIVATE_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES) \
--android-root=$(PRODUCT_OUT)/system
--android-root=$(PRODUCT_OUT)/system --include-patch-information --runtime-arg -Xnorelocate

View File

@ -20,7 +20,8 @@ PRODUCT_PACKAGES += \
core-libart \
libart \
dex2oat \
oatdump
oatdump \
patchoat
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
dalvik.vm.image-dex2oat-Xms=64m \