Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e222b9d6 authored by Vinh Tran's avatar Vinh Tran Committed by Gerrit Code Review
Browse files

Merge changes from topic "AFDO_PROFILES" 

* changes:
  Split PRODUCT_AFDO_PROFILES into two variables
  Optionally include afdo_profiles.mk if available
parents e16241ce 424539f6

core/product.mk

+2 −1
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ _product_list_vars += PRODUCT_PACKAGES_ARM64 
_product_list_vars += PRODUCT_PACKAGES_DEBUG_JAVA_COVERAGE

_product_list_vars += PRODUCT_PACKAGES_ENG

_product_list_vars += PRODUCT_PACKAGES_TESTS

_product_list_vars += PRODUCT_AFDO_PROFILES



# The device that this product maps to.

_product_single_value_vars += PRODUCT_DEVICE
@@ -396,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)

core/soong_config.mk

+11 −1
Original line number Diff line number Diff line
@@ -12,6 +12,16 @@ 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)



# 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, SourceRootDirs,             $(PRODUCT_SOURCE_ROOT_DIRS))



$(call add_json_list, AfdoProfiles,                $(PRODUCT_AFDO_PROFILES))

$(call add_json_list, AfdoProfiles,                $(ALL_AFDO_PROFILES))



$(call json_end)