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
This commit is contained in:
Mathieu Chartier 2018-01-17 21:25:09 +00:00 committed by Gerrit Code Review
commit dc9f2de809
1 changed files with 5 additions and 2 deletions

View File

@ -93,8 +93,11 @@ LIBART_TARGET_BOOT_ART_EXTRA_FILES += boot.oat boot.vdex
# If we use a boot image profile. # If we use a boot image profile.
my_use_profile_for_boot_image := $(PRODUCT_USE_PROFILE_FOR_BOOT_IMAGE) my_use_profile_for_boot_image := $(PRODUCT_USE_PROFILE_FOR_BOOT_IMAGE)
ifeq (,$(my_use_profile_for_boot_image)) ifeq (,$(my_use_profile_for_boot_image))
# If not set, use the default. # If not set, set the default to true if we are not a PDK build. PDK builds
my_use_profile_for_boot_image := false # 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 endif
ifeq (true,$(my_use_profile_for_boot_image)) ifeq (true,$(my_use_profile_for_boot_image))