tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Sort PRODUCT_UPDATABLE_BOOT_JARS.

Browse source 
At runtime it is now responsibility of derive_classpath to define value
of BOOTCLASSPATH. As we are modularizing BCP configs, the end goal is to
have a following ordering:

- ART APEX jars
- /system jars
- /system_ext jars
- /apex jars from non-updatable apexes
- /apex jars from updatable apexes

Note that /apex configs are sorted alphabetically, however they preserve
relative ordering of the jars exported from individual apexes. For
example, core-oj.jar would come before bouncycastle.jar if ART apex
defines their relative order as such.

To match end goal expectations of the APEX ordering, sort existing list
of PRODUCT_UPDATABLE_BOOT_JARS.

Bug: 180105615
Test: presubmit
Change-Id: I15512c0da79ad94b547325d563dac473c006f9fd
Merged-In: I15512c0da79ad94b547325d563dac473c006f9fd
This commit is contained in:
satayev 2021-04-28 13:27:33 +01:00
parent 35a7a43b56
commit c89e4a007a
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
target/product/default_art_config.mk
View file

@ -48,17 +48,17 @@ PRODUCT_BOOT_JARS += \
PRODUCT_BOOT_JARS += \ PRODUCT_BOOT_JARS += \
com.android.i18n:core-icu4j com.android.i18n:core-icu4j
# Updatable APEX jars. Keep the list sorted. # Updatable APEX jars. Keep the list sorted by module names and then library names.
PRODUCT_UPDATABLE_BOOT_JARS := \ PRODUCT_UPDATABLE_BOOT_JARS := \
com.android.conscrypt:conscrypt \ com.android.conscrypt:conscrypt \
com.android.ipsec:android.net.ipsec.ike \
com.android.media:updatable-media \ com.android.media:updatable-media \
com.android.mediaprovider:framework-mediaprovider \ com.android.mediaprovider:framework-mediaprovider \
com.android.os.statsd:framework-statsd \ com.android.os.statsd:framework-statsd \
com.android.permission:framework-permission \ com.android.permission:framework-permission \
com.android.sdkext:framework-sdkextensions \ com.android.sdkext:framework-sdkextensions \
com.android.wifi:framework-wifi \
com.android.tethering:framework-tethering \ com.android.tethering:framework-tethering \
com.android.ipsec:android.net.ipsec.ike com.android.wifi:framework-wifi
# Minimal configuration for running dex2oat (default argument values). # Minimal configuration for running dex2oat (default argument values).
# PRODUCT_USES_DEFAULT_ART_CONFIG must be true to enable boot image compilation. # PRODUCT_USES_DEFAULT_ART_CONFIG must be true to enable boot image compilation.