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

Commit c30981e2 authored by Richard Uhler's avatar Richard Uhler
Browse files

Remove option for non-pic dex preopt. 

Test: make checkbuild, aosp_bullhead-userdebug boots.
Bug: 33192586

Change-Id: I4dd179fac33d777fb10cc85a99ff68c3b0d0e03d
parent cbdc0bd0

core/dex_preopt.mk

+0 −5
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ SYSTEM_OTHER_ODEX_FILTER ?= app/% priv-app/% 
# The default values for pre-opting: always preopt PIC.

# Conditional to building on linux, as dex2oat currently does not work on darwin.

ifeq ($(HOST_OS),linux)

  WITH_DEXPREOPT_PIC ?= true

  WITH_DEXPREOPT ?= true

# For an eng build only pre-opt the boot image. This gives reasonable performance and still

# allows a simple workflow: building in frameworks/base and syncing.
@@ -40,10 +39,6 @@ ifeq ($(HOST_OS),linux) 
endif



GLOBAL_DEXPREOPT_FLAGS :=

ifeq ($(WITH_DEXPREOPT_PIC),true)

# Compile boot.oat as position-independent code if WITH_DEXPREOPT_PIC=true

GLOBAL_DEXPREOPT_FLAGS += --compile-pic

endif



# $(1): the .jar or .apk to remove classes.dex

define dexpreopt-remove-classes.dex

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 \

	--include-patch-information --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

+2 −1
Original line number Diff line number Diff line
@@ -71,7 +71,8 @@ $($(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 \

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

		--include-patch-information --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)