commit 2ad526124c60dccc24ee5b157787f1f01b323963
author Nicolas Geoffray <ngeoffray@google.com> Tue Dec 15 09:53:05 2015 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Tue Dec 15 09:54:30 2015 +0000
tree a74c3a6a0a193e27dfb134a8e920dbd2b9d83dd6
parent f2a9135ed14a59da38a65a0218e8e8486620a3ad

Revert "Revert "Make PIC and PREOPT default for all.""

bug:25801231

This reverts commit f2a9135ed14a59da38a65a0218e8e8486620a3ad.

Change-Id: I2eca605212b78505667af1f7e9c83f5cca5db35a

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index aa6d15f..211e06a 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -368,18 +368,6 @@
     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
 
@@ -415,10 +403,8 @@
           ro.setupwizard.mode=OPTIONAL
 endif
 ifndef is_sdk_build
-  # Don't verify or compile the image on eng builds to speed startup.
+  # To speedup startup of non-preopted builds, don't verify or compile the boot image.
   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