Merge changes I4a2692f3,Ifd8d3a2c into nyc-dev
* changes:
Build: Only preopt boot images in eng builds
Revert "Don't preopt on eng builds."
diff --git a/core/dex_preopt.mk b/core/dex_preopt.mk
index de0b80a..2941b73 100644
--- a/core/dex_preopt.mk
+++ b/core/dex_preopt.mk
@@ -21,12 +21,13 @@
# The default values for pre-opting: always preopt PIC.
# Conditional to building on linux, as dex2oat currently does not work on darwin.
-# Conditional to building a non-eng build, as it currently negatively affects
-# some development workflows.
-ifneq ($(TARGET_BUILD_VARIANT),eng)
- ifeq ($(HOST_OS),linux)
- WITH_DEXPREOPT_PIC ?= true
- WITH_DEXPREOPT ?= true
+ifeq ($(HOST_OS),linux)
+ WITH_DEXPREOPT_PIC ?= true
+ WITH_DEXPREOPT ?= true
+# For an eng build only pre-opt the boot image. This gives reasonable performance and still
+# allows a simple workflow: building in frameworks/base and syncing.
+ ifeq (eng,$(TARGET_BUILD_VARIANT))
+ WITH_DEXPREOPT_BOOT_IMG_ONLY ?= true
endif
endif