Merge "Specify dirty image objects for profile boot image"

am: 85f2ffd5ee

Change-Id: Ie9f5c9aced07d92a1ee8039706635d51a210e7c3
This commit is contained in:
Mathieu Chartier 2018-05-07 18:27:25 -07:00 committed by android-build-merger
commit 75eb79ca90

View file

@ -54,11 +54,11 @@ $($(my_2nd_arch_prefix)LIBART_TARGET_BOOT_ART_EXTRA_INSTALLED_FILES) : $($(my_2n
ifeq (,$(my_out_boot_image_profile_location)) ifeq (,$(my_out_boot_image_profile_location))
my_boot_image_flags := --image-classes=$(PRELOADED_CLASSES) my_boot_image_flags := --image-classes=$(PRELOADED_CLASSES)
my_boot_image_flags += $(DIRTY_IMAGE_OBJECTS_FLAGS)
else else
my_boot_image_flags := --compiler-filter=speed-profile my_boot_image_flags := --compiler-filter=speed-profile
my_boot_image_flags += --profile-file=$(my_out_boot_image_profile_location) my_boot_image_flags += --profile-file=$(my_out_boot_image_profile_location)
endif endif
my_boot_image_flags += $(DIRTY_IMAGE_OBJECTS_FLAGS)
ifneq (addresstrue,$(SANITIZE_TARGET)$(SANITIZE_LITE)) ifneq (addresstrue,$(SANITIZE_TARGET)$(SANITIZE_LITE))
# Skip recompiling the boot image for the second sanitization phase. We'll get separate paths # Skip recompiling the boot image for the second sanitization phase. We'll get separate paths