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

Commit 68d38154 authored by Nicolas Geoffray's avatar Nicolas Geoffray Committed by Gerrit Code Review
Browse files

Merge "Remove host-prefix command line argument to dex2oat."

parents 6808c260 5fd9a32c

core/dex_preopt_libart.mk

+1 −2
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ $(DEFAULT_DEX_PREOPT_BUILT_IMAGE): $(LIBART_TARGET_BOOT_DEX_FILES) $(DEX2OAT_DEP 
		--oat-location=$(patsubst %.art,%.oat,$(LIBART_BOOT_IMAGE)) \

		--image=$@ --base=$(LIBART_IMG_TARGET_BASE_ADDRESS) \

		--instruction-set=$(TARGET_ARCH) --instruction-set-features=$(DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES) \

		--host-prefix=$(DEXPREOPT_PRODUCT_DIR_FULL_PATH) --android-root=$(PRODUCT_OUT)/system

		--android-root=$(PRODUCT_OUT)/system





########################################################################
@@ -93,7 +93,6 @@ $(hide) $(DEX2OAT) \ 
	--dex-file=$(2) \

	--dex-location=$(3) \

	--oat-file=$(4) \

	--host-prefix=$(DEXPREOPT_PRODUCT_DIR_FULL_PATH) \

	--android-root=$(PRODUCT_OUT)/system \

	--instruction-set=$(TARGET_ARCH) \

	--instruction-set-features=$(DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES)