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

Commit 6bb41928 authored by David Srbecky's avatar David Srbecky Committed by Android Git Automerger
Browse files

am c8400a3e: Merge "Add --include-cfi compiler option." 

* commit 'c8400a3e':
  Add --include-cfi compiler option.
parents 45c4c5af c8400a3e

core/dex_preopt_libart.mk

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ $(hide) $(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-include-debug-symbols \

	--include-patch-information --runtime-arg -Xnorelocate --no-include-debug-symbols --no-include-cfi \

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

	$(PRIVATE_DEX_PREOPT_FLAGS)

endef

core/dex_preopt_libart_boot.mk

+1 −1
Original line number Diff line number Diff line
@@ -62,5 +62,5 @@ $($(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-include-debug-symbols \

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

		$(PRODUCT_DEX_PREOPT_BOOT_FLAGS) $(COMPILED_CLASSES_FLAGS)