List the user modules explicitly, and we can get rid of the support for the user tag!
Change-Id: I6f412ed4e08d784ed71ec170e870fcf30081963a
diff --git a/target/product/core.mk b/target/product/core.mk
index d637bd4..466216f 100644
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -22,7 +22,143 @@
ro.config.notification_sound=OnTheHunt.ogg \
ro.config.alarm_alert=Alarm_Classic.ogg
+# Core modules (will move elsewhere)
PRODUCT_PACKAGES := \
+ 20-dns.conf \
+ 95-configured \
+ adb \
+ adbd \
+ am \
+ android.policy \
+ android.test.runner \
+ app_process \
+ applypatch \
+ bmgr \
+ bootanimation \
+ bugreport \
+ dbus-daemon \
+ debuggerd \
+ dhcpcd \
+ dhcpcd-run-hooks \
+ dnsmasq \
+ dumpstate \
+ dumpsys \
+ framework \
+ fsck_msdos \
+ gralloc.default \
+ gzip \
+ ime \
+ init \
+ input \
+ javax.obex \
+ keystore \
+ libEGL \
+ libETC1 \
+ libFFTEm \
+ libGLES_android \
+ libGLESv1_CM \
+ libGLESv2 \
+ libSR_AudioIn \
+ libandroid \
+ libandroid_runtime \
+ libandroid_servers \
+ libaudioeffect_jni \
+ libaudioflinger \
+ libbinder \
+ libbundlewrapper \
+ libc \
+ libcamera_client \
+ libcameraservice \
+ libchromium_net \
+ libctest \
+ libcutils \
+ libdbus \
+ libdl \
+ libdrm1 \
+ libdrm1_jni \
+ libeffects \
+ libexif \
+ libgui \
+ libhardware \
+ libhardware_legacy \
+ libiprouteutil \
+ libjni_latinime \
+ libjnigraphics \
+ libjpeg \
+ liblog \
+ libm \
+ libmedia \
+ libmedia_jni \
+ libmediaplayerservice \
+ libmtp \
+ libnetlink \
+ libnetutils \
+ libpixelflinger \
+ libpower \
+ libreference-ril \
+ libreverbwrapper \
+ libril \
+ librtp_jni \
+ libsensorservice \
+ libskia \
+ libsonivox \
+ libsoundpool \
+ libsqlite \
+ libsrec_jni \
+ libstagefright \
+ libstagefright_amrnb_common \
+ libstagefright_avc_common \
+ libstagefright_enc_common \
+ libstagefright_foundation \
+ libstagefright_omx \
+ libstagefright_yuv \
+ libstdc++ \
+ libstlport \
+ libsurfaceflinger \
+ libsurfaceflinger_client \
+ libsystem_server \
+ libsysutils \
+ libthread_db \
+ libui \
+ libusbhost \
+ libutils \
+ libvisualizer \
+ libvorbisidec \
+ libwebcore \
+ libwpa_client \
+ linker \
+ logcat \
+ logwrapper \
+ mediaserver \
+ monkey \
+ mtpd \
+ ndc \
+ netcfg \
+ netd \
+ omx_tests \
+ ping \
+ platform.xml \
+ pppd \
+ pm \
+ racoon \
+ rild \
+ run-as \
+ schedtest \
+ screenshot \
+ sdcard \
+ service \
+ servicemanager \
+ services \
+ simg2img \
+ surfaceflinger \
+ svc \
+ system_server \
+ tc \
+ toolbox \
+ vdc \
+ vold
+
+PRODUCT_PACKAGES += \
ApplicationsProvider \
BackupRestoreConfirmation \
Browser \
diff --git a/target/product/generic_no_telephony.mk b/target/product/generic_no_telephony.mk
index 0c6e9ac..049d7c0 100644
--- a/target/product/generic_no_telephony.mk
+++ b/target/product/generic_no_telephony.mk
@@ -45,6 +45,22 @@
wpa_supplicant.conf
PRODUCT_PACKAGES += \
+ audio \
+ bluetoothd \
+ brcm_patchram_plus \
+ dhcpcd.conf \
+ hciattach \
+ libbluedroid \
+ libbluetooth \
+ libbluetoothd \
+ libglib \
+ network \
+ pand \
+ pppd \
+ sdptool \
+ wpa_supplicant
+
+PRODUCT_PACKAGES += \
icu.dat
PRODUCT_PACKAGES += \