commit 2784fd03e24a3eded7b1ef096c49650705830156
author Calin Juravle <calin@google.com> Thu Jan 31 09:37:31 2019 -0800
committer android-build-merger <android-build-merger@google.com> Thu Jan 31 09:37:31 2019 -0800
tree 080a530f01f69b6a0b4bc5c0a742440c9b0d19b5
parent 5641680e7f9c7844f8194c9a7ac09b41edc55b23
parent 77a08b4fb2e09e39f29f6f3625ed0107f73e27a8

Merge "Count hotness in system server compiled code" am: 4f3f03c09b am: 536c2d3de8
am: 77a08b4fb2

Change-Id: I9974a6e48aee713e51e88de022391c79a70b463d

target/product/profile_boot_common.mk

diff --git a/target/product/profile_boot_common.mk b/target/product/profile_boot_common.mk
index f243902..4147dfa 100644
--- a/target/product/profile_boot_common.mk
+++ b/target/product/profile_boot_common.mk
@@ -41,5 +41,8 @@
 
 # Use speed compiler filter since system server doesn't have JIT.
 PRODUCT_DEX_PREOPT_BOOT_FLAGS += --compiler-filter=speed
+# System server is speed compiled and doesn't have a separate preopt flag,
+# so we enable hotness in compiled code for everything.
+PRODUCT_DEX_PREOPT_DEFAULT_FLAGS := --count-hotness-in-compiled-code
 
 PRODUCT_DIST_BOOT_AND_SYSTEM_JARS := true