commit fbebe69ecf977dac80718091848593c95893e60c
author Bill Peckham <bpeckham@google.com> Thu Mar 05 22:03:47 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 05 22:03:47 2020 +0000
tree 693d79e88934e862d2ec2eb717b562688a1aa3b7
parent ba17b04741e08f7a1288b7ac273e8b201eb12371
parent 011255996c8509187ecbd828e31642f98b4f2035

Merge "Don't touch .installable_files for non-FULL_BUILD" into rvc-dev

target/product/base_system.mk

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index b32d94f..5df29e6 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.extservices \
     com.android.i18n \
@@ -329,7 +328,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 \

target/product/media_system.mk

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 \