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

Commit b8ec8bb2 authored by Alexander Dorokhine's avatar Alexander Dorokhine Committed by Android (Google) Code Review
Browse files

Merge "Add framework-appsearch apex on the classpath."

parents c24f9dbc a8bae14f

target/product/base_system.mk

+3 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ PRODUCT_PACKAGES += \ 
    apexd \

    appops \

    app_process \

    service-appsearch \

    appwidget \

    atrace \

    audioserver \
@@ -52,6 +51,7 @@ PRODUCT_PACKAGES += \ 
    cmd \

    com.android.adbd \

    com.android.apex.cts.shim.v1 \

    com.android.appsearch \

    com.android.conscrypt \

    com.android.cronet \

    com.android.i18n \
@@ -332,9 +332,11 @@ PRODUCT_BOOT_JARS := \ 
    framework-statsd \

    ike \

    updatable-media \

    framework-appsearch \

    framework-wifi



PRODUCT_UPDATABLE_BOOT_JARS := \

    com.android.appsearch:framework-appsearch \

    com.android.conscrypt:conscrypt \

    com.android.ipsec:ike \

    com.android.media:updatable-media \

target/product/media_system.mk

+3 −3
Original line number Diff line number Diff line
@@ -55,14 +55,14 @@ PRODUCT_SYSTEM_SERVER_JARS := \ 
    ethernet-service \

    com.android.location.provider \

    service-jobscheduler \

    service-blobstore \

    service-appsearch \

    service-blobstore



# 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.os.statsd:service-statsd \

    com.android.wifi:wifi-service \

    com.android.wifi:wifi-service



PRODUCT_COPY_FILES += \

    system/core/rootdir/etc/public.libraries.android.txt:system/etc/public.libraries.txt