Merge "Move WITH_DEXPREOPT default value"
This commit is contained in:
@@ -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
|
||||||
# ###############################################################
|
# ###############################################################
|
||||||
|
@@ -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
|
||||||
|
Reference in New Issue
Block a user