commit 7effde0048bcce6084e00bf29ff3bea4f34d1599
author Nicolas Geoffray <ngeoffray@google.com> Fri Dec 18 09:58:22 2015 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Fri Dec 18 10:14:31 2015 +0000
tree 63b6534bc87bf8ec1af23ae1060e35486fcd2131
parent c915b13a9cab9392184007ddd8ccf1f5f1809cf4

Don't preopt on eng builds.

It currently negatively affects some development workflows.

bug:25801231
Change-Id: Ib0476cdd9b4bbef80c6116ab8a5ae381bff047c0

core/dex_preopt.mk

diff --git a/core/dex_preopt.mk b/core/dex_preopt.mk
index 6499b63..de0b80a 100644
--- a/core/dex_preopt.mk
+++ b/core/dex_preopt.mk
@@ -21,9 +21,13 @@
 
 # The default values for pre-opting: always preopt PIC.
 # Conditional to building on linux, as dex2oat currently does not work on darwin.
-ifeq ($(HOST_OS),linux)
-  WITH_DEXPREOPT_PIC ?= true
-  WITH_DEXPREOPT ?= true
+# 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
+  endif
 endif
 
 # $(1): the .jar or .apk to remove classes.dex