DO NOT MERGE: Remove AppSearch from Android R.
Test: presubmit
Bug: 150249538
Change-Id: I98774c8e8686b6d8fcb058ab0f1d5d4ecfa314cb
diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index b14f01f..1b33e95 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -50,7 +50,6 @@
cmd \
com.android.adbd \
com.android.apex.cts.shim.v1 \
- com.android.appsearch \
com.android.conscrypt \
com.android.cronet \
com.android.extservices \
@@ -331,7 +330,6 @@
framework-telephony
PRODUCT_UPDATABLE_BOOT_JARS := \
- com.android.appsearch:framework-appsearch \
com.android.conscrypt:conscrypt \
com.android.media:updatable-media \
com.android.mediaprovider:framework-mediaprovider \
diff --git a/target/product/media_system.mk b/target/product/media_system.mk
index 9bf9668..dd80f04 100644
--- a/target/product/media_system.mk
+++ b/target/product/media_system.mk
@@ -60,7 +60,6 @@
# 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.permission:service-permission \
com.android.wifi:wifi-service \
com.android.ipsec:android.net.ipsec.ike \
