Merge "Move 6 packages up from core_base.mk"
diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 7cfe90b..66834a3 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -98,12 +98,14 @@
ld.mc \
libaaudio \
libandroid \
+ libandroidfw \
libandroid_runtime \
libandroid_servers \
libaudioeffect_jni \
libaudioflinger \
libaudiopolicymanager \
libaudiopolicyservice \
+ libaudioutils \
libbinder \
libc \
libcamera2ndk \
@@ -135,6 +137,7 @@
libkeystore \
liblog \
libm \
+ libmdnssd \
libmedia \
libmedia_jni \
libmediandk \
@@ -149,6 +152,7 @@
libpdfium \
libpixelflinger \
libpower \
+ libpowermanager \
libradio_metadata \
librtp_jni \
libsensorservice \
@@ -159,6 +163,7 @@
libsoundpool \
libsoundtrigger \
libsoundtriggerservice \
+ libspeexresampler \
libsqlite \
libstagefright \
libstagefright_amrnb_common \
diff --git a/target/product/core_base.mk b/target/product/core_base.mk
index 575bd60..9ab49ef 100644
--- a/target/product/core_base.mk
+++ b/target/product/core_base.mk
@@ -22,13 +22,5 @@
Home \
TelephonyProvider \
UserDictionaryProvider \
- libandroidfw \
- libaudioutils \
- libmdnssd \
- libnfc_ndef \
- libpowermanager \
- libspeexresampler \
- libvariablespeed \
- libwebrtc_audio_preprocessing \
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_minimal.mk)
diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk
index 41881ac..3470a53 100644
--- a/target/product/core_minimal.mk
+++ b/target/product/core_minimal.mk
@@ -56,6 +56,7 @@
libstagefright_soft_vorbisdec \
libstagefright_soft_vpxdec \
libstagefright_soft_vpxenc \
+ libwebrtc_audio_preprocessing \
libwebviewchromium_loader \
libwebviewchromium_plat_support \
logd \