From 11079b3d3fa63c2a390895e6adea658e7cee9f00 Mon Sep 17 00:00:00 2001 From: satayev Date: Tue, 20 Jul 2021 13:52:16 +0100 Subject: [PATCH] Rename PRODUCT_UPDATABLE_BOOT_JARS to PRODUCT_APEX_BOOT_JARS. Regardless of an "updatable" property of individual, list all apex boot jars in the same variable. This is less confusing for devs, especially since they shouldn't care about things like boot images. Bug: 191127295 Test: atest CtsClasspathsTestCases Change-Id: I0a559db462d1e1f67003ac54d1e27a89110d802a --- core/dex_preopt_config.mk | 2 +- core/product.mk | 4 ++-- core/product_config.mk | 10 +++++----- core/soong_config.mk | 2 +- target/product/default_art_config.mk | 7 +++---- 5 files changed, 12 insertions(+), 13 deletions(-) diff --git a/core/dex_preopt_config.mk b/core/dex_preopt_config.mk index 51238a36ca..e8bcdb82c1 100644 --- a/core/dex_preopt_config.mk +++ b/core/dex_preopt_config.mk @@ -104,7 +104,7 @@ ifeq ($(WRITE_SOONG_VARIABLES),true) $(call add_json_bool, DisableGenerateProfile, $(filter false,$(WITH_DEX_PREOPT_GENERATE_PROFILE))) $(call add_json_str, ProfileDir, $(PRODUCT_DEX_PREOPT_PROFILE_DIR)) $(call add_json_list, BootJars, $(PRODUCT_BOOT_JARS)) - $(call add_json_list, UpdatableBootJars, $(PRODUCT_UPDATABLE_BOOT_JARS)) + $(call add_json_list, UpdatableBootJars, $(PRODUCT_APEX_BOOT_JARS)) $(call add_json_list, ArtApexJars, $(filter $(PRODUCT_BOOT_JARS),$(ART_APEX_JARS))) $(call add_json_list, SystemServerJars, $(PRODUCT_SYSTEM_SERVER_JARS)) $(call add_json_list, SystemServerApps, $(PRODUCT_SYSTEM_SERVER_APPS)) diff --git a/core/product.mk b/core/product.mk index 7e8445e3d0..a87e287e12 100644 --- a/core/product.mk +++ b/core/product.mk @@ -374,7 +374,7 @@ _product_list_vars += PRODUCT_CERTIFICATE_OVERRIDES # A list of : pairs that specifies APEX module # overrides to be applied to the APEX names in the boot jar variables -# (PRODUCT_BOOT_JARS, PRODUCT_UPDATABLE_BOOT_JARS etc). +# (PRODUCT_BOOT_JARS, PRODUCT_APEX_BOOT_JARS etc). _product_list_vars += PRODUCT_BOOT_JAR_MODULE_OVERRIDES # Controls for whether different partitions are built for the current product. @@ -397,7 +397,7 @@ _product_single_value_vars += PRODUCT_BUILD_SUPER_EMPTY_IMAGE # List of boot jars delivered via updatable APEXes, following the same format as # PRODUCT_BOOT_JARS. -_product_list_vars += PRODUCT_UPDATABLE_BOOT_JARS +_product_list_vars += PRODUCT_APEX_BOOT_JARS # If set, device uses virtual A/B. _product_single_value_vars += PRODUCT_VIRTUAL_AB_OTA diff --git a/core/product_config.mk b/core/product_config.mk index 53bc9dd48a..a9f3d34efb 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -252,9 +252,9 @@ PRODUCT_BOOT_JARS := $(call qualify-platform-jars,$(PRODUCT_BOOT_JARS)) # b/191127295: force core-icu4j onto boot image. It comes from a non-updatable APEX jar, but has # historically been part of the boot image; even though APEX jars are not meant to be part of the # boot image. -# TODO(b/191686720): remove PRODUCT_UPDATABLE_BOOT_JARS to avoid a special handling of core-icu4j +# TODO(b/191686720): remove PRODUCT_APEX_BOOT_JARS to avoid a special handling of core-icu4j # in make rules. -PRODUCT_UPDATABLE_BOOT_JARS := $(filter-out com.android.i18n:core-icu4j,$(PRODUCT_UPDATABLE_BOOT_JARS)) +PRODUCT_APEX_BOOT_JARS := $(filter-out com.android.i18n:core-icu4j,$(PRODUCT_APEX_BOOT_JARS)) # All APEX jars come after /system and /system_ext jars, so adding core-icu4j at the end of the list PRODUCT_BOOT_JARS += com.android.i18n:core-icu4j @@ -268,7 +268,7 @@ define replace-boot-jar-module-overrides endef $(call replace-boot-jar-module-overrides,PRODUCT_BOOT_JARS) -$(call replace-boot-jar-module-overrides,PRODUCT_UPDATABLE_BOOT_JARS) +$(call replace-boot-jar-module-overrides,PRODUCT_APEX_BOOT_JARS) $(call replace-boot-jar-module-overrides,ART_APEX_JARS) # The extra system server jars must be appended at the end after common system server jars. @@ -312,10 +312,10 @@ ifdef PRODUCT_DEFAULT_DEV_CERTIFICATE endif endif -$(foreach pair,$(PRODUCT_UPDATABLE_BOOT_JARS), \ +$(foreach pair,$(PRODUCT_APEX_BOOT_JARS), \ $(eval jar := $(call word-colon,2,$(pair))) \ $(if $(findstring $(jar), $(PRODUCT_BOOT_JARS)), \ - $(error A jar in PRODUCT_UPDATABLE_BOOT_JARS must not be in PRODUCT_BOOT_JARS, but $(jar) is))) + $(error A jar in PRODUCT_APEX_BOOT_JARS must not be in PRODUCT_BOOT_JARS, but $(jar) is))) ENFORCE_SYSTEM_CERTIFICATE := $(PRODUCT_ENFORCE_ARTIFACT_SYSTEM_CERTIFICATE_REQUIREMENT) ENFORCE_SYSTEM_CERTIFICATE_ALLOW_LIST := $(PRODUCT_ARTIFACT_SYSTEM_CERTIFICATE_REQUIREMENT_ALLOW_LIST) diff --git a/core/soong_config.mk b/core/soong_config.mk index 1d94661ed1..fb0b80dd20 100644 --- a/core/soong_config.mk +++ b/core/soong_config.mk @@ -142,7 +142,7 @@ $(call add_json_bool, UncompressPrivAppDex, $(call invert_bool,$(fi $(call add_json_list, ModulesLoadedByPrivilegedModules, $(PRODUCT_LOADED_BY_PRIVILEGED_MODULES)) $(call add_json_list, BootJars, $(PRODUCT_BOOT_JARS)) -$(call add_json_list, UpdatableBootJars, $(PRODUCT_UPDATABLE_BOOT_JARS)) +$(call add_json_list, UpdatableBootJars, $(PRODUCT_APEX_BOOT_JARS)) $(call add_json_bool, VndkUseCoreVariant, $(TARGET_VNDK_USE_CORE_VARIANT)) $(call add_json_bool, VndkSnapshotBuildArtifacts, $(VNDK_SNAPSHOT_BUILD_ARTIFACTS)) diff --git a/target/product/default_art_config.mk b/target/product/default_art_config.mk index 8fe5cfd154..6a564bdac9 100644 --- a/target/product/default_art_config.mk +++ b/target/product/default_art_config.mk @@ -25,9 +25,8 @@ endif # 4. Non-updatable APEX jars # 5. Updatable APEX jars # -# ART APEX jars (1) are defined in ART_APEX_JARS. System, system_ext, and non updatable boot jars -# are defined below in PRODUCT_BOOT_JARS. All updatable APEX boot jars are part of -# PRODUCT_UPDATABLE_BOOT_JARS. +# ART APEX jars (1) are defined in ART_APEX_JARS. System and system_ext boot jars are defined below +# in PRODUCT_BOOT_JARS. All other non-art APEX boot jars are part of the PRODUCT_APEX_BOOT_JARS. # # The actual runtime ordering matching above is determined by derive_classpath service at runtime. # See packages/modules/SdkExtensions/README.md for more details. @@ -47,7 +46,7 @@ PRODUCT_BOOT_JARS += \ # APEX boot jars. Keep the list sorted by module names and then library names. # Note: core-icu4j is moved back to PRODUCT_BOOT_JARS in product_config.mk at a later stage. -PRODUCT_UPDATABLE_BOOT_JARS := \ +PRODUCT_APEX_BOOT_JARS := \ com.android.appsearch:framework-appsearch \ com.android.conscrypt:conscrypt \ com.android.i18n:core-icu4j \