commit 67d3081d3f00b73ce3cea35b128bcd07bd983ea1
author Anton Hansson <hansson@google.com> Thu Feb 28 10:26:31 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Feb 28 10:26:31 2019 +0000
tree 695ed78023c3c5c4e2c80a4e9e4ba1d927aa569f
parent 2507ce486d5934b6715061a5edc2d1355b8b4c28
parent 74dc00b88f22df69659ffde13acb047ef7116858

Merge "Move WITH_DEXPREOPT default value"

core/board_config.mk

diff --git a/core/board_config.mk b/core/board_config.mk
index 1e0e9e1..528c133 100644
--- a/core/board_config.mk
+++ b/core/board_config.mk
@@ -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

diff --git a/core/dex_preopt_config.mk b/core/dex_preopt_config.mk
index 9bf2be8..13e4634 100644
--- a/core/dex_preopt_config.mk
+++ b/core/dex_preopt_config.mk
@@ -20,7 +20,6 @@
 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