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

Commit 557e7e54 authored by Brian Carlstrom's avatar Brian Carlstrom Committed by Android Git Automerger
Browse files

am ce06199a: Merge "Make system use patchoat to relocate during runtime." 

* commit 'ce06199a':
  Make system use patchoat to relocate during runtime.
parents 9b80095e ce06199a

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 \