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

Merge changes from topic "AFDO_PROFILES"

Browse source 
* changes:
  Split PRODUCT_AFDO_PROFILES into two variables
  Optionally include afdo_profiles.mk if available
This commit is contained in:
Vinh Tran 2023-04-21 15:06:28 +00:00 committed by Gerrit Code Review
commit e222b9d6e4
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/product.mk
View file

@ -41,7 +41,6 @@ _product_list_vars += PRODUCT_PACKAGES_ARM64
_product_list_vars += PRODUCT_PACKAGES_DEBUG_JAVA_COVERAGE _product_list_vars += PRODUCT_PACKAGES_DEBUG_JAVA_COVERAGE
_product_list_vars += PRODUCT_PACKAGES_ENG _product_list_vars += PRODUCT_PACKAGES_ENG
_product_list_vars += PRODUCT_PACKAGES_TESTS _product_list_vars += PRODUCT_PACKAGES_TESTS
_product_list_vars += PRODUCT_AFDO_PROFILES
# The device that this product maps to. # The device that this product maps to.
_product_single_value_vars += PRODUCT_DEVICE _product_single_value_vars += PRODUCT_DEVICE
@ -396,6 +395,8 @@ _product_list_vars += PRODUCT_VENDOR_LINKER_CONFIG_FRAGMENTS
# supports it # supports it
_product_single_value_vars += PRODUCT_ENABLE_UFFD_GC _product_single_value_vars += PRODUCT_ENABLE_UFFD_GC
_product_list_vars += PRODUCT_AFDO_PROFILES
.KATI_READONLY := _product_single_value_vars _product_list_vars .KATI_READONLY := _product_single_value_vars _product_list_vars
_product_var_list :=$= $(_product_single_value_vars) $(_product_list_vars) _product_var_list :=$= $(_product_single_value_vars) $(_product_list_vars)

12
core/soong_config.mk
View file

@ -12,6 +12,16 @@ endif
include $(BUILD_SYSTEM)/art_config.mk include $(BUILD_SYSTEM)/art_config.mk
include $(BUILD_SYSTEM)/dex_preopt_config.mk include $(BUILD_SYSTEM)/dex_preopt_config.mk
ifndef AFDO_PROFILES
# Set AFDO_PROFILES
-include vendor/google_data/pgo_profile/sampling/afdo_profiles.mk
else
$(error AFDO_PROFILES can only be set from soong_config.mk. For product-specific fdo_profiles, please use PRODUCT_AFDO_PROFILES)
endif
# PRODUCT_AFDO_PROFILES takes precedence over product-agnostic profiles in AFDO_PROFILES
ALL_AFDO_PROFILES := $(PRODUCT_AFDO_PROFILES) $(AFDO_PROFILES)
ifeq ($(WRITE_SOONG_VARIABLES),true) ifeq ($(WRITE_SOONG_VARIABLES),true)
# Create soong.variables with copies of makefile settings. Runs every build, # Create soong.variables with copies of makefile settings. Runs every build,
@ -309,7 +319,7 @@ $(call add_json_bool, IgnorePrefer32OnDevice, $(filter true,$(IGNORE_PREFER32_ON
$(call add_json_list, IncludeTags, $(PRODUCT_INCLUDE_TAGS)) $(call add_json_list, IncludeTags, $(PRODUCT_INCLUDE_TAGS))
$(call add_json_list, SourceRootDirs, $(PRODUCT_SOURCE_ROOT_DIRS)) $(call add_json_list, SourceRootDirs, $(PRODUCT_SOURCE_ROOT_DIRS))
$(call add_json_list, AfdoProfiles, $(PRODUCT_AFDO_PROFILES)) $(call add_json_list, AfdoProfiles, $(ALL_AFDO_PROFILES))
$(call json_end) $(call json_end)