commit 139a0c6e3ddb1035437bc7e4daecd804f0eb33c3
author Jeff Sharkey <jsharkey@google.com> Sun Dec 08 21:20:33 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sun Dec 08 21:20:33 2019 +0000
tree c84275e8157568a1d0f94591dcafd9bacb90381f
parent 995821a6ab1ee266c1521177004ccb6fdc20ef71
parent 5a4593c9d7f663b69e488b929c4dfbdfadbb0366

Merge "Structure MediaProvider as an APEX."

CleanSpec.mk

diff --git a/CleanSpec.mk b/CleanSpec.mk
index 4a0ac62..6e7bf62 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -713,6 +713,9 @@
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/apex/com.android.cellbroadcast.apex)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/apex/com.android.cellbroadcast)
 
+# Remove MediaProvider after moving into APEX
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/MediaProvider)
+
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************

target/product/base_system.mk

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 415158b..98da3fc 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -58,6 +58,7 @@
     com.android.location.provider \
     com.android.media \
     com.android.media.swcodec \
+    com.android.mediaprovider \
     com.android.permission \
     com.android.resolv \
     com.android.neuralnetworks \
@@ -204,7 +205,7 @@
     mediaextractor \
     mediametrics \
     media_profiles_V1_0.dtd \
-    MediaProvider \
+    MediaProviderLegacy \
     mediaserver \
     mediatranscoding \
     mke2fs \