diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-06-10 15:57:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-06-10 15:57:53 +0000 |
| commit | 72e0ffd9187fa3f618bcdebcc4ed426c82eeabbc (patch) | |
| tree | c13011003856362c3851c13ed181cb08f2b3418a | |
| parent | c137b8520b9b438093aac604ece838d8857ebb1a (diff) | |
| parent | d56062009ac2020dbed3fae36d31030a321f692c (diff) | |
| download | build-72e0ffd9187fa3f618bcdebcc4ed426c82eeabbc.tar.gz | |
Merge "Move PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS to default_art_config.mk."
| -rw-r--r-- | target/product/default_art_config.mk | 7 | ||||
| -rw-r--r-- | target/product/media_system.mk | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/target/product/default_art_config.mk b/target/product/default_art_config.mk index 0e652c1e93..f0916f9284 100644 --- a/target/product/default_art_config.mk +++ b/target/product/default_art_config.mk @@ -48,7 +48,7 @@ PRODUCT_BOOT_JARS += \ PRODUCT_BOOT_JARS += \ com.android.i18n:core-icu4j -# Updatable APEX jars. Keep the list sorted by module names and then library names. +# Updatable APEX boot 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 \ @@ -60,6 +60,11 @@ PRODUCT_UPDATABLE_BOOT_JARS := \ com.android.tethering:framework-tethering \ com.android.wifi:framework-wifi +# Updatable APEX system server jars. Keep the list sorted by module names and then library names. +PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS := \ + com.android.art:service-art \ + com.android.permission:service-permission \ + # 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 := true diff --git a/target/product/media_system.mk b/target/product/media_system.mk index c7ac9071b4..30a8621b15 100644 --- a/target/product/media_system.mk +++ b/target/product/media_system.mk @@ -54,12 +54,6 @@ PRODUCT_SYSTEM_SERVER_JARS := \ services \ ethernet-service -# system server jars which are updated via apex modules. -# The values should be of the format <apex name>:<jar name> -PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS := \ - com.android.art:service-art \ - com.android.permission:service-permission \ - PRODUCT_COPY_FILES += \ system/core/rootdir/etc/public.libraries.android.txt:system/etc/public.libraries.txt |