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

Merge "Revert "Align boot jar exclusion with apex_contributions"" into main

Browse Source
This commit is contained in:
Spandan Das
2024-04-30 23:24:05 +00:00
committed by Gerrit Code Review
parent c0102331c8 213847d3f6
commit 7d5b29ef85
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/art_config.mk
View File

@@ -24,16 +24,17 @@ 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 :=
# If a device has opted to not use google prebuilts (determined using $(foreach pair, $(RELEASE_APEX_BOOT_JARS_PREBUILT_EXCLUDED_LIST),\
# PRODUCT_BUILD_IGNORE_APEX_CONTRIBUTION_CONTENTS), then no jars need to be removed. $(eval m := $(subst com.android.,,$(call word-colon,1,$(pair)))) \
# Example of products where PRODUCT_BUILD_IGNORE_APEX_CONTRIBUTION_CONTENTS is true are $(if $(call soong_config_get,$(m)_module,source_build), \
# 1. aosp devices (they do not use google apexes) $(if $(filter true,$(call soong_config_get,$(m)_module,source_build)),, \
# 2. hwasan devices (apex prebuilts are not compatible with these devices) $(eval APEX_BOOT_JARS_EXCLUDED += $(pair))), \
# 3. coverage builds $(if $(filter true,$(call soong_config_get,ANDROID,module_build_from_source)),, \
ifneq (true, $(PRODUCT_BUILD_IGNORE_APEX_CONTRIBUTION_CONTENTS)) $(eval APEX_BOOT_JARS_EXCLUDED += $(pair)))))
APEX_BOOT_JARS_EXCLUDED += $(RELEASE_APEX_BOOT_JARS_PREBUILT_EXCLUDED_LIST)
endif