Merge "Move WITH_DEXPREOPT default value" am: 67d3081d3f

am: 5141484847

Change-Id: I3f183c52d3d49213630ab004937e07efc6ba8faf
This commit is contained in:
Anton Hansson
2019-02-28 02:36:34 -08:00
committed by android-build-merger
2 changed files with 5 additions and 1 deletions

View File

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

View File

@@ -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