From 49377db572f9b6d7a4d0dc1dc25d531753b6549b Mon Sep 17 00:00:00 2001 From: Jiakai Zhang Date: Wed, 22 Dec 2021 13:38:17 +0000 Subject: [PATCH] Update comments for Makefile variables about APEX jars. Modules available in Q should not add new entries to PRODUCT_APEX_*_JARS. Otherwise, there will be problems when a Q device gets new modules and then OTAs to S, in which case, the device will have the S version of SdkExtension (because SdkExtension is not available in Q, see go/mainline-ota-problem), and the S version of SdkExtension cannot consume those new entries correctly. Bug: 203198541 Test: N/A Change-Id: I15367ca59a06b4ee5fdb3803f2e4615b5d03b458 --- target/product/default_art_config.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/target/product/default_art_config.mk b/target/product/default_art_config.mk index f98f7e275b..1a0fc76757 100644 --- a/target/product/default_art_config.mk +++ b/target/product/default_art_config.mk @@ -49,6 +49,7 @@ PRODUCT_BOOT_JARS += \ # APEX boot jars. Keep the list sorted by module names and then library names. # 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 := \ com.android.appsearch:framework-appsearch \ com.android.conscrypt:conscrypt \ @@ -67,6 +68,7 @@ PRODUCT_APEX_BOOT_JARS := \ # 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. PRODUCT_APEX_SYSTEM_SERVER_JARS := \ com.android.appsearch:service-appsearch \ com.android.art:service-art \ @@ -81,6 +83,7 @@ PRODUCT_STANDALONE_SYSTEM_SERVER_JARS := \ # List of jars delivered via apex that system_server loads dynamically using separate classloaders. # Keep the list sorted by module names and then library names. +# Note: For modules available in Q, DO NOT add new entries here. PRODUCT_APEX_STANDALONE_SYSTEM_SERVER_JARS := \ com.android.os.statsd:service-statsd \ com.android.scheduling:service-scheduling \