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

Commit 0bf41ecc authored by satayev's avatar satayev Committed by Automerger Merge Worker
Browse files

resolve merge conflicts of 7a7b416b to... 

resolve merge conflicts of 7a7b416b to sc-dev-plus-aosp am: 6fa54793

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14934133

Change-Id: I4f863d8db6dee3c86e30eaa6089b714dda97d44d
parents 62aec150 6fa54793

target/product/default_art_config.mk

+9 −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,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

target/product/media_system.mk

+0 −9
Original line number Diff line number Diff line
@@ -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