commit f2a9135ed14a59da38a65a0218e8e8486620a3ad
author Nicolas Geoffray <ngeoffray@google.com> Mon Dec 14 18:22:17 2015 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Mon Dec 14 18:22:17 2015 +0000
tree 0d05e089bbbcbd69cc28f440561f2c12fcd76665
parent b93f5905d268b8745dac1689f0871fa5c5b28315

Revert "Make PIC and PREOPT default for all."

Need to update seed and ariel.

This reverts commit b93f5905d268b8745dac1689f0871fa5c5b28315.

Change-Id: Icc6f1539a97ccb2b1fcb12d2bc48904045689096

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index 211e06a..aa6d15f 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -368,6 +368,18 @@
     enable_target_debugging :=
   endif
 
+  # Turn on Dalvik preoptimization for user builds, but only if not
+  # explicitly disabled and the build is running on Linux (since host
+  # Dalvik isn't built for non-Linux hosts).
+  ifeq (,$(WITH_DEXPREOPT))
+    ifeq ($(user_variant),user)
+      ifeq ($(HOST_OS),linux)
+        # TODO: turn on WITH_DEXPREOPT for libart user builds.
+        # WITH_DEXPREOPT := true
+      endif
+    endif
+  endif
+
   # Disallow mock locations by default for user builds
   ADDITIONAL_DEFAULT_PROPERTIES += ro.allow.mock.location=0
 
@@ -403,8 +415,10 @@
           ro.setupwizard.mode=OPTIONAL
 endif
 ifndef is_sdk_build
-  # To speedup startup of non-preopted builds, don't verify or compile the boot image.
+  # Don't verify or compile the image on eng builds to speed startup.
   ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.image-dex2oat-filter=verify-at-runtime
+  # Don't verify or compile apps on eng builds to speed startup.
+  ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.dex2oat-filter=verify-at-runtime
 endif
 endif