Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 66bb2ab3 authored by satayev's avatar satayev Committed by Artur Satayev
Browse files

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
parent 1efb3858

target/product/default_art_config.mk

+8 −1
Original line number Diff line number Diff line
@@ -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,13 @@ 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.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

target/product/media_system.mk

+0 −8
Original line number Diff line number Diff line
@@ -54,14 +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.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