diff options
| author | Spandan Das <spandandas@google.com> | 2024-04-30 23:24:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-04-30 23:24:05 +0000 |
| commit | 7d5b29ef85ae254ed500ab99357776bd48969afd (patch) | |
| tree | 49a67c52f693cf62d35333b3ebc2ecd1a51d5a40 | |
| parent | c0102331c883dddbe96ae5de4ed905df2271e53d (diff) | |
| parent | 213847d3f6bf39b1e04524b7d3556ba02e2e8b2b (diff) | |
| download | build-7d5b29ef85ae254ed500ab99357776bd48969afd.tar.gz | |
Merge "Revert "Align boot jar exclusion with apex_contributions"" into main
| -rw-r--r-- | core/art_config.mk | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/core/art_config.mk b/core/art_config.mk index a3f9a41da6..47b4bcfce6 100644 --- a/core/art_config.mk +++ b/core/art_config.mk @@ -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 # 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 # 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. -# -# If a device has opted to not use google prebuilts (determined using -# PRODUCT_BUILD_IGNORE_APEX_CONTRIBUTION_CONTENTS), then no jars need to be removed. -# Example of products where PRODUCT_BUILD_IGNORE_APEX_CONTRIBUTION_CONTENTS is true are -# 1. aosp devices (they do not use google apexes) -# 2. hwasan devices (apex prebuilts are not compatible with these devices) -# 3. coverage builds -ifneq (true, $(PRODUCT_BUILD_IGNORE_APEX_CONTRIBUTION_CONTENTS)) - APEX_BOOT_JARS_EXCLUDED += $(RELEASE_APEX_BOOT_JARS_PREBUILT_EXCLUDED_LIST) -endif +APEX_BOOT_JARS_EXCLUDED := +$(foreach pair, $(RELEASE_APEX_BOOT_JARS_PREBUILT_EXCLUDED_LIST),\ + $(eval m := $(subst com.android.,,$(call word-colon,1,$(pair)))) \ + $(if $(call soong_config_get,$(m)_module,source_build), \ + $(if $(filter true,$(call soong_config_get,$(m)_module,source_build)),, \ + $(eval APEX_BOOT_JARS_EXCLUDED += $(pair))), \ + $(if $(filter true,$(call soong_config_get,ANDROID,module_build_from_source)),, \ + $(eval APEX_BOOT_JARS_EXCLUDED += $(pair))))) |