diff options
| author | satayev <satayev@google.com> | 2021-06-08 16:02:05 +0100 |
|---|---|---|
| committer | satayev <satayev@google.com> | 2021-06-10 12:46:54 +0000 |
| commit | d56062009ac2020dbed3fae36d31030a321f692c (patch) | |
| tree | 70ed212faf2c32159297aa7525d7ef1e3cf121fc | |
| parent | 041770b553a794f1bf955ef231d6c4c3bc1b5a16 (diff) | |
| download | build-d56062009ac2020dbed3fae36d31030a321f692c.tar.gz | |
Move PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS to default_art_config.mk.
The list of updatable system server jars must be known in
module_common.mk which is used to build mainline modules that contain
said system server jars.
module_common.mk inherit from default_art_config.mk.
Note that we could also move the defition into a separate make file,
if current change causes problems. However, places like clockwork
overwrite values of PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS instead
of appending to them, so it should not be a source of issues.
Bug: 180105615
Bug: 190407034
Test: TARGET_BUILD_VARIANT=user vendor/google/build/build_mainline_modules.sh -j64 and inspecting build artifacts
Change-Id: I771895bf0a974a4c6aa4f7374159c22536f03891
Merged-In: I771895bf0a974a4c6aa4f7374159c22536f03891
Merged-In: Id867ec12ab546613f63a50d608192ab5134f65bb
(cherry picked from commit 66bb2ab32dd040a74bc40f3f41d0cc5df0c9d71b)
| -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 |