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

Commit 74dc00b8 authored by Anton Hansson's avatar Anton Hansson
Browse files

Move WITH_DEXPREOPT default value 

This allows setting the variable READONLY after reading the BoardConfig.

This is safe to do because this flag is only set in BoardConfig.mk
files. The same is not true for many of the other default preopt flags,
like DEX_PREOPT_DEFAULT or WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY
which are set in mixture of product / board config files.

Test: boot blueline
Change-Id: I961ba581f9790bcdc7cf6b36d8b53bcdb8861a92
parent 72e36f02

core/board_config.mk

+5 −0
Original line number Diff line number Diff line
@@ -19,6 +19,11 @@ 
# and sanity-checks the variable defined therein.

# ###############################################################



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

ifeq ($(HOST_OS),linux)

  WITH_DEXPREOPT := true

endif



# ###############################################################

# Broken build defaults

# ###############################################################

core/dex_preopt_config.mk

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ ifeq ($(PRODUCT_DEX_PREOPT_NEVER_ALLOW_STRIPPING),) 
endif

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

ifeq ($(HOST_OS),linux)

  WITH_DEXPREOPT ?= true

  ifeq (eng,$(TARGET_BUILD_VARIANT))

    # Don't strip for quick development turnarounds.

    DEX_PREOPT_DEFAULT := nostripping