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

Commit 53502853 authored by David Srbecky's avatar David Srbecky Committed by android-build-merger
Browse files

Merge "Generate SHA-1 build ID for host-generated *.oat files (2/2)." 

am: 5ccc874b

Change-Id: I4814a46b548db7e8f851745f3b637f7a8c91f652
parents 05388b76 5ccc874b

core/dex_preopt_libart.mk

+2 −1
Original line number Diff line number Diff line
@@ -104,7 +104,8 @@ $(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 --no-generate-debug-info \

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

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

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

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

	$(PRIVATE_DEX_PREOPT_FLAGS) \

core/dex_preopt_libart_boot.mk

+2 −1
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ $($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME) : $(LIBART_TARGE 
		--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) \

		--android-root=$(PRODUCT_OUT)/system --include-patch-information --runtime-arg -Xnorelocate --no-generate-debug-info \

		--android-root=$(PRODUCT_OUT)/system --include-patch-information --runtime-arg -Xnorelocate \

		--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)