commit c5536ffbd3fbbd44a167c0841a12d11ef6976946
author Mathieu Chartier <mathieuc@google.com> Fri May 05 14:59:06 2017 -0700
committer Mathieu Chartier <mathieuc@google.com> Fri May 05 15:04:01 2017 -0700
tree 4de136b82338b283538f87b99e4fa5f9e7dc405b
parent ff1984b27db96925cbfbfaf4764186226818529d

Use speed-profile instead of quicken for the profile case

Reduces calculator launch from 354 -> 325 with a profile.

Bug: 38032017

Test: mm

Change-Id: I795a2d3f4db5546be4d77c3716e69d20d8f23549

core/dex_preopt_odex_install.mk

diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk
index a3fb410..f078510 100644
--- a/core/dex_preopt_odex_install.mk
+++ b/core/dex_preopt_odex_install.mk
@@ -159,7 +159,12 @@
 else
   # If no compiler filter is specified, default to 'quicken' to save on storage.
   ifeq (,$(filter --compiler-filter=%, $(LOCAL_DEX_PREOPT_FLAGS)))
-    LOCAL_DEX_PREOPT_FLAGS += --compiler-filter=quicken
+    ifeq (true,$(LOCAL_DEX_PREOPT_GENERATE_PROFILE))
+      # For non system server jars, use speed-profile when we have a profile.
+      LOCAL_DEX_PREOPT_FLAGS += --compiler-filter=speed-profile
+    else
+      LOCAL_DEX_PREOPT_FLAGS += --compiler-filter=quicken
+    endif
   endif
 endif