commit be97a415715824562e4ea93efb211b0d5baeb300
author Andreas Gampe <agampe@google.com> Wed Mar 30 23:05:59 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 30 23:05:59 2016 +0000
tree cb092432f4a0db7068fe756f6c9de4affdcda04a
parent bbb7b1b62075f1ac34e94a357747ed4692229c14
parent 8e121663e6d2878e340be257c03c6060182117de

Merge "Build: Switch eng build boot dexopt to verify-at-runtime" into nyc-dev

target/product/core_minimal.mk

diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk
index 6fdc5c3..13f23ad 100644
--- a/target/product/core_minimal.mk
+++ b/target/product/core_minimal.mk
@@ -118,9 +118,17 @@
     system/core/rootdir/etc/public.libraries.android.txt:system/etc/public.libraries.txt
 
 # Different dexopt types for different package update/install times.
+# On eng builds, make "boot" reasons do pure JIT for faster turnaround.
+ifeq (eng,$(TARGET_BUILD_VARIANT))
+    PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
+        pm.dexopt.first-boot=verify-at-runtime \
+        pm.dexopt.boot=verify-at-runtime
+else
+    PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
+        pm.dexopt.first-boot=interpret-only \
+        pm.dexopt.boot=verify-profile
+endif
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
-    pm.dexopt.first-boot=interpret-only \
-    pm.dexopt.boot=verify-profile \
     pm.dexopt.install=interpret-only \
     pm.dexopt.bg-dexopt=speed-profile \
     pm.dexopt.ab-ota=speed-profile \

target/product/core_tiny.mk

diff --git a/target/product/core_tiny.mk b/target/product/core_tiny.mk
index 76281f9..9c94574 100644
--- a/target/product/core_tiny.mk
+++ b/target/product/core_tiny.mk
@@ -108,9 +108,17 @@
     ro.carrier=unknown
 
 # Different dexopt types for different package update/install times.
+# On eng builds, make "boot" reasons do pure JIT for faster turnaround.
+ifeq (eng,$(TARGET_BUILD_VARIANT))
+    PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
+        pm.dexopt.first-boot=verify-at-runtime \
+        pm.dexopt.boot=verify-at-runtime
+else
+    PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
+        pm.dexopt.first-boot=interpret-only \
+        pm.dexopt.boot=verify-profile
+endif
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
-    pm.dexopt.first-boot=interpret-only \
-    pm.dexopt.boot=verify-profile \
     pm.dexopt.install=interpret-only \
     pm.dexopt.bg-dexopt=speed-profile \
     pm.dexopt.ab-ota=speed-profile \