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

Merge "Remove jars in PRODUCT_APEX_BOOT_JARS_FOR_SOURCE_BUILD_ONLY (e.g. framework-pdf in MP) from ApexBootJars when prebuilt is enabled." into main am: c7bc53999d am: 566f69178c am: b02812d84c

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2822531

Change-Id: Ia37497d25763fcd2ef563f2cc6097a9cae65737b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Alyssa Ketpreechasawat
2023-11-14 20:42:55 +00:00
committed by Automerger Merge Worker
parent 34c9aa9492 b02812d84c
commit 82f52a7cfc
4 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
target/product/default_art_config.mk
View File

@@ -57,6 +57,8 @@ PRODUCT_BOOT_JARS += \
ims-common
# APEX boot jars. Keep the list sorted by module names and then library names.
# Note: If the existing apex introduces the new jar, also add it to
# PRODUCT_APEX_BOOT_JARS_FOR_SOURCE_BUILD_ONLY below.
# Note: core-icu4j is moved back to PRODUCT_BOOT_JARS in product_config.mk at a later stage.
# Note: For modules available in Q, DO NOT add new entries here.
PRODUCT_APEX_BOOT_JARS := \
@@ -85,6 +87,12 @@ PRODUCT_APEX_BOOT_JARS := \
com.android.virt:framework-virtualization \
com.android.wifi:framework-wifi \
# 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 \
# 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.