tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Allow multiple profiles to be added as part of boot.prof"

Browse source 
am: a3010c60fe

Change-Id: I7a0c4770e1cd8fa94971bc3982f2b14cf1a1c553
This commit is contained in:
Mathieu Chartier 2018-07-06 16:14:53 -07:00 committed by android-build-merger
commit f604a3d1cf
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
core/dex_preopt_libart.mk
View file

@ -106,13 +106,21 @@ endif
ifeq (true,$(my_use_profile_for_boot_image))
# Location of text based profile for the boot image.
my_boot_image_profile_location := $(PRODUCT_DEX_PREOPT_BOOT_IMAGE_PROFILE_LOCATION)
ifeq (,$(my_boot_image_profile_location))
boot_image_profiles := $(PRODUCT_DEX_PREOPT_BOOT_IMAGE_PROFILE_LOCATION)
ifeq (,$(boot_image_profiles))
# If not set, use the default.
my_boot_image_profile_location := frameworks/base/config/boot-image-profile.txt
boot_image_profiles := frameworks/base/config/boot-image-profile.txt
endif
# Location of text based profile for the boot image.
my_boot_image_profile_location := $(PRODUCT_OUT)/dex_bootjars/boot-image-profile.txt
$(my_boot_image_profile_location): $(boot_image_profiles)
@echo 'Generating $@ for profman'
@rm -rf $@
$(hide) cat $^ > $@
# Code to create the boot image profile, not in dex_preopt_libart_boot.mk since the profile is the same for all archs.
my_out_boot_image_profile_location := $(DEXPREOPT_BOOT_JAR_DIR_FULL_PATH)/boot.prof
$(my_out_boot_image_profile_location): PRIVATE_PROFILE_INPUT_LOCATION := $(my_boot_image_profile_location)