From c89e4a007ab46b6cdfe366301a3fec0eb8bc70d1 Mon Sep 17 00:00:00 2001 From: satayev Date: Wed, 28 Apr 2021 13:27:33 +0100 Subject: [PATCH] Sort PRODUCT_UPDATABLE_BOOT_JARS. 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 --- target/product/default_art_config.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/target/product/default_art_config.mk b/target/product/default_art_config.mk index feb2eb71db..0e652c1e93 100644 --- a/target/product/default_art_config.mk +++ b/target/product/default_art_config.mk @@ -48,17 +48,17 @@ PRODUCT_BOOT_JARS += \ PRODUCT_BOOT_JARS += \ 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 := \ com.android.conscrypt:conscrypt \ + com.android.ipsec:android.net.ipsec.ike \ com.android.media:updatable-media \ com.android.mediaprovider:framework-mediaprovider \ com.android.os.statsd:framework-statsd \ com.android.permission:framework-permission \ com.android.sdkext:framework-sdkextensions \ - com.android.wifi:framework-wifi \ 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). # PRODUCT_USES_DEFAULT_ART_CONFIG must be true to enable boot image compilation.