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

Commit 139a0c6e authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Structure MediaProvider as an APEX."

parents 995821a6 5a4593c9

CleanSpec.mk

+3 −0
Original line number Diff line number Diff line
@@ -713,6 +713,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/vintf/manifest/android.h 
$(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

+2 −1
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ PRODUCT_PACKAGES += \ 
    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 @@ PRODUCT_PACKAGES += \ 
    mediaextractor \

    mediametrics \

    media_profiles_V1_0.dtd \

    MediaProvider \

    MediaProviderLegacy \

    mediaserver \

    mediatranscoding \

    mke2fs \