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

Commit bf0fea29 authored by Richard Uhler's avatar Richard Uhler Committed by android-build-merger
Browse files

Merge "Don't include patch information for dex preopt." 

am: 6f8e0d06

Change-Id: I99b47062c2c4db2c3f64e16a4188ff046fd5e7d4
parents 848e9430 6f8e0d06

core/dex_preopt_libart.mk

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ $(hide) ANDROID_LOG_TAGS="*:e" $(DEX2OAT) \ 
	--instruction-set=$($(PRIVATE_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_ARCH) \

	--instruction-set-variant=$($(PRIVATE_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_CPU_VARIANT) \

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

	--include-patch-information --runtime-arg -Xnorelocate --compile-pic \

	--runtime-arg -Xnorelocate --compile-pic \

	--no-generate-debug-info --generate-build-id \

	--abort-on-hard-verifier-error \

	--no-inline-from=core-oj.jar \

core/dex_preopt_libart_boot.mk

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ $($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME) : $(LIBART_TARGE 
		--instruction-set-variant=$($(PRIVATE_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_CPU_VARIANT) \

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

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

		--include-patch-information --runtime-arg -Xnorelocate --compile-pic \

		--runtime-arg -Xnorelocate --compile-pic \

		--no-generate-debug-info --generate-build-id \

		--multi-image --no-inline-from=core-oj.jar \

		$(PRODUCT_DEX_PREOPT_BOOT_FLAGS) $(GLOBAL_DEXPREOPT_FLAGS) $(COMPILED_CLASSES_FLAGS) $(ART_BOOT_IMAGE_EXTRA_ARGS)