StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflicts of 7a7b416b81 to sc-dev-plus-aosp

Browse Source 
Change-Id: Id867ec12ab546613f63a50d608192ab5134f65bb
Merged-In: I771895bf0a974a4c6aa4f7374159c22536f03891
This commit is contained in:
satayev
2021-06-10 13:40:40 +01:00
committed by Artur Satayev
parent c9e50e33b1 7a7b416b81
commit 6fa5479378
2 changed files with 9 additions and 10 deletions
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 += \ PRODUCT_BOOT_JARS += \
com.android.i18n:core-icu4j 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 := \ PRODUCT_UPDATABLE_BOOT_JARS := \
com.android.appsearch:framework-appsearch \ com.android.appsearch:framework-appsearch \
com.android.conscrypt:conscrypt \ com.android.conscrypt:conscrypt \
@@ -65,6 +65,14 @@ PRODUCT_UPDATABLE_BOOT_JARS := \
com.android.tethering:framework-tethering \ com.android.tethering:framework-tethering \
com.android.wifi:framework-wifi 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). # 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 must be true to enable boot image compilation.
PRODUCT_USES_DEFAULT_ART_CONFIG := true PRODUCT_USES_DEFAULT_ART_CONFIG := true

9
target/product/media_system.mk
View File

@@ -54,15 +54,6 @@ PRODUCT_SYSTEM_SERVER_JARS := \
services \ services \
ethernet-service 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 += \ PRODUCT_COPY_FILES += \
system/core/rootdir/etc/public.libraries.android.txt:system/etc/public.libraries.txt system/core/rootdir/etc/public.libraries.android.txt:system/etc/public.libraries.txt