Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce06199a authored by Brian Carlstrom's avatar Brian Carlstrom Committed by Gerrit Code Review
Browse files

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

parents 430ec575 ce090d3f

core/dex_preopt_libart.mk

+2 −1
Original line number Diff line number Diff line
@@ -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

core/dex_preopt_libart_boot.mk

+1 −1
Original line number Diff line number Diff line
@@ -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

target/product/runtime_libart.mk

+2 −1
Original line number Diff line number Diff line
@@ -20,7 +20,8 @@ PRODUCT_PACKAGES += \ 
        core-libart \

        libart \

        dex2oat \

        oatdump

        oatdump \

        patchoat



PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \

    dalvik.vm.image-dex2oat-Xms=64m \