commit dc9f2de809ad035da9c7068e246c7af37bb34983
author Mathieu Chartier <mathieuc@google.com> Wed Jan 17 21:25:09 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 17 21:25:09 2018 +0000
tree 159c7385be621081f6755269b121d85dad484f47
parent 65c90ca5b96d57087fc15b03648b3a52c52a03e2
parent 8fd29b365358e0c4169626482c5d3f5d1cdd083b

Merge changes Iba0c3893,Icf3039ef

* changes:
  Don't default my_use_profile_for_boot_image to true for PDK builds
  Enable profile based boot image by default

core/dex_preopt_libart.mk

diff --git a/core/dex_preopt_libart.mk b/core/dex_preopt_libart.mk
index 79e72c1..20d43dc 100644
--- a/core/dex_preopt_libart.mk
+++ b/core/dex_preopt_libart.mk
@@ -93,8 +93,11 @@
 # If we use a boot image profile.
 my_use_profile_for_boot_image := $(PRODUCT_USE_PROFILE_FOR_BOOT_IMAGE)
 ifeq (,$(my_use_profile_for_boot_image))
-# If not set, use the default.
-my_use_profile_for_boot_image := false
+# If not set, set the default to true if we are not a PDK build. PDK builds
+# can't build the profile since they don't have frameworks/base.
+ifneq (true,$(TARGET_BUILD_PDK))
+my_use_profile_for_boot_image := true
+endif
 endif
 
 ifeq (true,$(my_use_profile_for_boot_image))