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

Move PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS to default_art_config.mk.

Browse source 
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
This commit is contained in:
satayev 2021-06-08 16:02:05 +01:00
parent 5b3f0e6210
commit af56f2eadc
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
target/product/default_art_config.mk
View file

@ -49,7 +49,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.appsearch:framework-appsearch \
com.android.conscrypt:conscrypt \
@ -65,6 +65,14 @@ 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.appsearch:service-appsearch \
com.android.art:service-art \
com.android.media:service-media-s \
com.android.permission:service-permission \
com.android.geotz:geotz \
# 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

9
target/product/media_system.mk
View file

@ -54,15 +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.appsearch:service-appsearch \
com.android.art:service-art \
com.android.media:service-media-s \
com.android.permission:service-permission \
com.android.geotz:geotz \
PRODUCT_COPY_FILES += \
system/core/rootdir/etc/public.libraries.android.txt:system/etc/public.libraries.txt