Merge "Move a few packages from core_minimal.mk to base.mk." into stage-aosp-master

target/product/base.mk

@@ -46,6 +46,7 @@ PRODUCT_PACKAGES += \
     CtsShimPrebuilt \
     CtsShimPrivPrebuilt \
     dnsmasq \
+    DownloadProvider \
     dpm \
     e2fsck \
     ExtServices \
@@ -56,6 +57,7 @@ PRODUCT_PACKAGES += \
     fsck_msdos \
     gatekeeperd \
     hid \
+    idmap \
     ime \
     ims-common \
     incident \
@@ -109,6 +111,7 @@ PRODUCT_PACKAGES += \
     libnetd_client \
     libnetlink \
     libnetutils \
+    libneuralnetworks \
     libOpenMAXAL \
     libOpenSLES \
     libpdfium \
@@ -140,12 +143,14 @@ PRODUCT_PACKAGES += \
     libwilhelm \
     locksettings \
     logd \
+    mdnsd \
     media \
     media_cmd \
     media_profiles_V1_0.dtd \
     mediadrmserver \
     mediaextractor \
     mediametrics \
+    MediaProvider \
     mediaserver \
     mke2fs \
     monkey \

target/product/core_minimal.mk

@@ -30,11 +30,9 @@ PRODUCT_PACKAGES += \
     CompanionDeviceManager \
     ContactsProvider \
     DefaultContainerService \
-    DownloadProvider \
     drmserver \
     ethernet-service \
     HTMLViewer \
-    idmap \
     libaudiopreprocessing \
     libdownmix \
     libdrmframework \
@@ -44,7 +42,6 @@ PRODUCT_PACKAGES += \
     libgabi++ \
     libgatekeeper \
     libkeystore \
-    libneuralnetworks \
     libstagefright_soft_aacdec \
     libstagefright_soft_aacenc \
     libstagefright_soft_amrdec \
@@ -68,8 +65,6 @@ PRODUCT_PACKAGES += \
     libstagefright_soft_vpxenc \
     libwebviewchromium_loader \
     libwebviewchromium_plat_support \
-    mdnsd \
-    MediaProvider \
     PackageInstaller \
     requestsync \
     StatementService \