Merge "Revert "Make PIC and PREOPT default for all."" (1e745d79) · Commits · e / os / android_build

core/dex_preopt.mk

+0 −7

Original line number	Diff line number	Diff line
		@@ -19,13 +19,6 @@ DEXPREOPT_BOOT_JAR_DIR_FULL_PATH := $(DEXPREOPT_PRODUCT_DIR_FULL_PATH)/$(DEXPREO
		# The default value for LOCAL_DEX_PREOPT
		DEX_PREOPT_DEFAULT ?= true

		# 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
		endif

		# $(1): the .jar or .apk to remove classes.dex
		define dexpreopt-remove-classes.dex
		$(hide) zip --quiet --delete $(1) classes.dex; \

+15 −1

Original line number	Diff line number	Diff line
		@@ -368,6 +368,18 @@ ifneq (,$(user_variant))
		enable_target_debugging :=
		endif

		# Turn on Dalvik preoptimization for user builds, but only if not
		# explicitly disabled and the build is running on Linux (since host
		# Dalvik isn't built for non-Linux hosts).
		ifeq (,$(WITH_DEXPREOPT))
		ifeq ($(user_variant),user)
		ifeq ($(HOST_OS),linux)
		# TODO: turn on WITH_DEXPREOPT for libart user builds.
		# WITH_DEXPREOPT := true
		endif
		endif
		endif

		# Disallow mock locations by default for user builds
		ADDITIONAL_DEFAULT_PROPERTIES += ro.allow.mock.location=0

		@@ -403,8 +415,10 @@ ifneq ($(filter ro.setupwizard.mode=ENABLED, $(call collapse-pairs, $(ADDITIONAL
		ro.setupwizard.mode=OPTIONAL
		endif
		ifndef is_sdk_build
		# To speedup startup of non-preopted builds, don't verify or compile the boot image.
		# Don't verify or compile the image on eng builds to speed startup.
		ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.image-dex2oat-filter=verify-at-runtime
		# Don't verify or compile apps on eng builds to speed startup.
		ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.dex2oat-filter=verify-at-runtime
		endif
		endif