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

Commit 72e0ffd9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Move PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS to default_art_config.mk."

parents c137b852 d5606200

target/product/default_art_config.mk

+6 −1
Original line number Diff line number Diff line
@@ -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

target/product/media_system.mk

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