From dc158cff8bf9dc600e4f52e51d04cf4bb5ae5ec4 Mon Sep 17 00:00:00 2001 From: Vinh Tran Date: Thu, 6 Apr 2023 00:05:05 -0400 Subject: [PATCH] Optionally include afdo_profiles.mk if available Previously, the product var is defined in pixel product config only. This breaks SDK finalization for udc (google3/configs/wireless/android/busytown/platform/git_udc/git_udc-release.gcl). In SDK finalization, we need to ensure performance/usage of libraries are consistent across all builds that don't set SKIP_ABI_CHECKS. This CL optionally includes the afdo_profiles if available so that afdo is on all products by default. Ignore-AOSP-First: The topic has internal-only CLs Test: CI Bug: 276672785 Change-Id: I2cc51412de141c4e6ad69f49cef378121e0b3b87 --- core/product.mk | 1 - core/soong_config.mk | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/core/product.mk b/core/product.mk index 5f1e14515f..4c254bffb2 100644 --- a/core/product.mk +++ b/core/product.mk @@ -40,7 +40,6 @@ _product_list_vars += PRODUCT_PACKAGES_DEBUG_ASAN _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 diff --git a/core/soong_config.mk b/core/soong_config.mk index 6348cf0457..a3961f9ed6 100644 --- a/core/soong_config.mk +++ b/core/soong_config.mk @@ -12,6 +12,8 @@ endif include $(BUILD_SYSTEM)/art_config.mk include $(BUILD_SYSTEM)/dex_preopt_config.mk +-include vendor/google_data/pgo_profile/sampling/afdo_profiles.mk + ifeq ($(WRITE_SOONG_VARIABLES),true) # Create soong.variables with copies of makefile settings. Runs every build,