Merge "Move WITH_DEXPREOPT default value"

This commit is contained in:
Anton Hansson
2019-02-28 10:26:31 +00:00
committed by Gerrit Code Review
2 changed files with 5 additions and 1 deletions

View File

@@ -19,6 +19,11 @@
# and sanity-checks the variable defined therein. # 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 # Broken build defaults
# ############################################################### # ###############################################################

View File

@@ -20,7 +20,6 @@ ifeq ($(PRODUCT_DEX_PREOPT_NEVER_ALLOW_STRIPPING),)
endif endif
# Conditional to building on linux, as dex2oat currently does not work on darwin. # Conditional to building on linux, as dex2oat currently does not work on darwin.
ifeq ($(HOST_OS),linux) ifeq ($(HOST_OS),linux)
WITH_DEXPREOPT ?= true
ifeq (eng,$(TARGET_BUILD_VARIANT)) ifeq (eng,$(TARGET_BUILD_VARIANT))
# Don't strip for quick development turnarounds. # Don't strip for quick development turnarounds.
DEX_PREOPT_DEFAULT := nostripping DEX_PREOPT_DEFAULT := nostripping