StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Split PRODUCT_AFDO_PROFILES into two variables" into tm-qpr-dev-plus-aosp

Browse Source
This commit is contained in:
Vinh Tran
2023-04-20 19:20:19 +00:00
committed by Android (Google) Code Review
parent 4f600c2a34 ebce49601a
commit 42b7e605c2
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/product.mk
View File

@@ -395,6 +395,8 @@ _product_list_vars += PRODUCT_VENDOR_LINKER_CONFIG_FRAGMENTS
# supports it
_product_single_value_vars += PRODUCT_ENABLE_UFFD_GC
_product_list_vars += PRODUCT_AFDO_PROFILES
.KATI_READONLY := _product_single_value_vars _product_list_vars
_product_var_list :=$= $(_product_single_value_vars) $(_product_list_vars)

10
core/soong_config.mk
View File

@@ -12,7 +12,15 @@ endif
include $(BUILD_SYSTEM)/art_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)
@@ -311,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, SourceRootDirs, $(PRODUCT_SOURCE_ROOT_DIRS))
$(call add_json_list, AfdoProfiles, $(PRODUCT_AFDO_PROFILES))
$(call add_json_list, AfdoProfiles, $(ALL_AFDO_PROFILES))
$(call json_end)