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

Reland align boot jar exclusion with apex_contributions

Browse Source 
This relands https://r.android.com/3063301 alongside a Soong CL that
updates the bootclasspath_fragment content validation code.

Bug: 328578801
Test: m nothing --no-skip-soong-tests
Change-Id: Ifa894d4e3270829ff69669e1a914cdea8d7fb03f
This commit is contained in:
Spandan Das
2024-05-03 22:07:06 +00:00
parent 984f5ca822
commit e23f6ffd97
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/art_config.mk
View File

@@ -24,17 +24,16 @@ ADDITIONAL_PRODUCT_PROPERTIES += ro.dalvik.vm.enable_uffd_gc=$(config_enable_uff
# Create APEX_BOOT_JARS_EXCLUDED which is a list of jars to be removed from # Create APEX_BOOT_JARS_EXCLUDED which is a list of jars to be removed from
# ApexBoorJars when built from mainline prebuilts. # ApexBoorJars when built from mainline prebuilts.
# soong variables indicate whether the prebuilt is enabled:
# - $(m)_module/source_build for art and TOGGLEABLE_PREBUILT_MODULES
# - ANDROID/module_build_from_source for other mainline modules
# Note that RELEASE_APEX_BOOT_JARS_PREBUILT_EXCLUDED_LIST is the list of module names # Note that RELEASE_APEX_BOOT_JARS_PREBUILT_EXCLUDED_LIST is the list of module names
# and library names of jars that need to be removed. We have to keep separated list per # and library names of jars that need to be removed. We have to keep separated list per
# release config due to possibility of different prebuilt content. # release config due to possibility of different prebuilt content.
APEX_BOOT_JARS_EXCLUDED := #
$(foreach pair, $(RELEASE_APEX_BOOT_JARS_PREBUILT_EXCLUDED_LIST),\ # If a device has opted to not use google prebuilts (determined using
$(eval m := $(subst com.android.,,$(call word-colon,1,$(pair)))) \ # PRODUCT_BUILD_IGNORE_APEX_CONTRIBUTION_CONTENTS), then no jars need to be removed.
$(if $(call soong_config_get,$(m)_module,source_build), \ # Example of products where PRODUCT_BUILD_IGNORE_APEX_CONTRIBUTION_CONTENTS is true are
$(if $(filter true,$(call soong_config_get,$(m)_module,source_build)),, \ # 1. aosp devices (they do not use google apexes)
$(eval APEX_BOOT_JARS_EXCLUDED += $(pair))), \ # 2. hwasan devices (apex prebuilts are not compatible with these devices)
$(if $(filter true,$(call soong_config_get,ANDROID,module_build_from_source)),, \ # 3. coverage builds
$(eval APEX_BOOT_JARS_EXCLUDED += $(pair))))) ifneq (true, $(PRODUCT_BUILD_IGNORE_APEX_CONTRIBUTION_CONTENTS))
APEX_BOOT_JARS_EXCLUDED += $(RELEASE_APEX_BOOT_JARS_PREBUILT_EXCLUDED_LIST)
endif