Merge "Remove Soong intermdiates after moving image mutator"
diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 0d752c3..6c2a19e 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -30,7 +30,6 @@
apexd \
appops \
app_process \
- service-appsearch \
appwidget \
atrace \
audioserver \
@@ -52,6 +51,7 @@
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 @@
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 \
diff --git a/target/product/media_system.mk b/target/product/media_system.mk
index fed4282..7962a19 100644
--- a/target/product/media_system.mk
+++ b/target/product/media_system.mk
@@ -55,14 +55,14 @@
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