StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make system use patchoat to relocate during runtime."

Browse Source
This commit is contained in:
Brian Carlstrom
2014-08-05 17:47:26 +00:00
committed by Gerrit Code Review
parent 430ec575cd ce090d3f45
commit ce06199a04
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/dex_preopt_libart.mk
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

2
core/dex_preopt_libart_boot.mk
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

3
target/product/runtime_libart.mk
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 \