diff options
| author | Alyssa Ketpreechasawat <kalyssa@google.com> | 2024-02-29 18:17:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-02-29 18:17:09 +0000 |
| commit | eb4f3ec4b897029f65078f94b59addf7d5e3df63 (patch) | |
| tree | cc90f9edc4df4fea4bda29e64a8cfecb66203360 | |
| parent | 7c489994468717e09b1abf5b63a7b85379dba501 (diff) | |
| parent | 74dabedcb3ed045607e39ec1611191af2877ed89 (diff) | |
| download | build-eb4f3ec4b897029f65078f94b59addf7d5e3df63.tar.gz | |
Merge "Use build flag to control the apex boot jars to be excluded." into main
| -rw-r--r-- | core/art_config.mk | 5 | ||||
| -rw-r--r-- | target/product/default_art_config.mk | 7 |
2 files changed, 4 insertions, 8 deletions
diff --git a/core/art_config.mk b/core/art_config.mk index 54bfd6b728..47b4bcfce6 100644 --- a/core/art_config.mk +++ b/core/art_config.mk @@ -27,8 +27,11 @@ ADDITIONAL_PRODUCT_PROPERTIES += ro.dalvik.vm.enable_uffd_gc=$(config_enable_uff # 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. 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)))) \ $(if $(call soong_config_get,$(m)_module,source_build), \ $(if $(filter true,$(call soong_config_get,$(m)_module,source_build)),, \ diff --git a/target/product/default_art_config.mk b/target/product/default_art_config.mk index dca9baacfd..d13a4c47d3 100644 --- a/target/product/default_art_config.mk +++ b/target/product/default_art_config.mk @@ -104,13 +104,6 @@ else com.android.nfcservices:framework-nfc 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. # Keep the list sorted by module names and then library names. # Note: For modules available in Q, DO NOT add new entries here. |