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

Merge "Use build flag to control the apex boot jars to be excluded." into main

Browse Source
This commit is contained in:
Alyssa Ketpreechasawat
2024-02-29 18:17:09 +00:00
committed by Gerrit Code Review
parent 7c48999446 74dabedcb3
commit eb4f3ec4b8
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/art_config.mk
View File

@@ -27,8 +27,11 @@ ADDITIONAL_PRODUCT_PROPERTIES += ro.dalvik.vm.enable_uffd_gc=$(config_enable_uff
# soong variables indicate whether the prebuilt is enabled: # soong variables indicate whether the prebuilt is enabled:
# - $(m)_module/source_build for art and TOGGLEABLE_PREBUILT_MODULES # - $(m)_module/source_build for art and TOGGLEABLE_PREBUILT_MODULES
# - ANDROID/module_build_from_source for other mainline 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.
APEX_BOOT_JARS_EXCLUDED := APEX_BOOT_JARS_EXCLUDED :=
$(foreach pair, $(PRODUCT_APEX_BOOT_JARS_FOR_SOURCE_BUILD_ONLY),\ $(foreach pair, $(RELEASE_APEX_BOOT_JARS_PREBUILT_EXCLUDED_LIST),\
$(eval m := $(subst com.android.,,$(call word-colon,1,$(pair)))) \ $(eval m := $(subst com.android.,,$(call word-colon,1,$(pair)))) \
$(if $(call soong_config_get,$(m)_module,source_build), \ $(if $(call soong_config_get,$(m)_module,source_build), \
$(if $(filter true,$(call soong_config_get,$(m)_module,source_build)),, \ $(if $(filter true,$(call soong_config_get,$(m)_module,source_build)),, \

7
target/product/default_art_config.mk
View File

@@ -104,13 +104,6 @@ else
com.android.nfcservices:framework-nfc com.android.nfcservices:framework-nfc
endif endif
# TODO(b/308174306): Adjust this after multiple prebuilts version is supported.
# APEX boot jars that are not in prebuilt apexes.
# Keep the list sorted by module names and then library names.
PRODUCT_APEX_BOOT_JARS_FOR_SOURCE_BUILD_ONLY := \
com.android.mediaprovider:framework-pdf \
com.android.mediaprovider:framework-pdf-v \
# List of system_server classpath jars delivered via apex. # List of system_server classpath jars delivered via apex.
# Keep the list sorted by module names and then library names. # Keep the list sorted by module names and then library names.
# Note: For modules available in Q, DO NOT add new entries here. # Note: For modules available in Q, DO NOT add new entries here.