Move a few packages from core_minimal.mk to base.mk.
All the products that inherit from base.mk add these packages, so moving
them up the hierarchy eliminates some duplication.
DownloadProvider
idmap
libneuralnetworks
mdnsd
MediaProvider
Bug: 80410283
Test: diff all product variables with multiproduct_kati
Change-Id: I133a385b3bc64261d73f616c416f7a905675c09d
diff --git a/target/product/base.mk b/target/product/base.mk
index c18d049..8ca5d29 100644
--- a/target/product/base.mk
+++ b/target/product/base.mk
@@ -47,6 +47,7 @@
CtsShimPrebuilt \
CtsShimPrivPrebuilt \
dnsmasq \
+ DownloadProvider \
dpm \
e2fsck \
ExtServices \
@@ -57,6 +58,7 @@
fsck_msdos \
gatekeeperd \
hid \
+ idmap \
ime \
ims-common \
incident \
@@ -110,6 +112,7 @@
libnetd_client \
libnetlink \
libnetutils \
+ libneuralnetworks \
libOpenMAXAL \
libOpenSLES \
libpdfium \
@@ -141,12 +144,14 @@
libwilhelm \
locksettings \
logd \
+ mdnsd \
media \
media_cmd \
media_profiles_V1_0.dtd \
mediadrmserver \
mediaextractor \
mediametrics \
+ MediaProvider \
mediaserver \
mke2fs \
monkey \
diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk
index c59e133..3fb4a73 100644
--- a/target/product/core_minimal.mk
+++ b/target/product/core_minimal.mk
@@ -30,11 +30,9 @@
CompanionDeviceManager \
ContactsProvider \
DefaultContainerService \
- DownloadProvider \
drmserver \
ethernet-service \
HTMLViewer \
- idmap \
libaudiopreprocessing \
libdownmix \
libdrmframework \
@@ -44,7 +42,6 @@
libgabi++ \
libgatekeeper \
libkeystore \
- libneuralnetworks \
libstagefright_soft_aacdec \
libstagefright_soft_aacenc \
libstagefright_soft_amrdec \
@@ -68,8 +65,6 @@
libstagefright_soft_vpxenc \
libwebviewchromium_loader \
libwebviewchromium_plat_support \
- mdnsd \
- MediaProvider \
PackageInstaller \
requestsync \
StatementService \