Move the old user tagged modules over to base.mk so mini and core both share them.
Change-Id: I9d3a3c165fa56d4ca137b3c06e249e1deea6a1c5
diff --git a/target/product/base.mk b/target/product/base.mk
new file mode 100644
index 0000000..afde9b5
--- /dev/null
+++ b/target/product/base.mk
@@ -0,0 +1,147 @@
+#
+# Copyright (C) 2012 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Base modules (will move elsewhere, previously user tagged)
+PRODUCT_PACKAGES += \
+ 20-dns.conf \
+ 95-configured \
+ adb \
+ adbd \
+ am \
+ android.policy \
+ android.test.runner \
+ app_process \
+ applypatch \
+ bmgr \
+ bootanimation \
+ bugreport \
+ content \
+ dbus-daemon \
+ debuggerd \
+ dhcpcd \
+ dhcpcd-run-hooks \
+ dnsmasq \
+ dumpstate \
+ dumpsys \
+ framework \
+ fsck_msdos \
+ gralloc.default \
+ gzip \
+ ime \
+ init \
+ input \
+ javax.obex \
+ 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 \
+ 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 \
+ 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 \
+ ping \
+ platform.xml \
+ pppd \
+ pm \
+ racoon \
+ run-as \
+ schedtest \
+ screenshot \
+ sdcard \
+ service \
+ servicemanager \
+ services \
+ surfaceflinger \
+ svc \
+ system_server \
+ tc \
+ toolbox \
+ vdc \
+ vold
+
diff --git a/target/product/core.mk b/target/product/core.mk
index d0f4093..a6408db 100644
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -22,137 +22,6 @@
ro.config.notification_sound=OnTheHunt.ogg \
ro.config.alarm_alert=Alarm_Classic.ogg
-# Core modules (will move elsewhere, previously user tagged)
-PRODUCT_PACKAGES := \
- 20-dns.conf \
- 95-configured \
- adb \
- adbd \
- am \
- android.policy \
- android.test.runner \
- app_process \
- applypatch \
- bmgr \
- bootanimation \
- bugreport \
- content \
- dbus-daemon \
- debuggerd \
- dhcpcd \
- dhcpcd-run-hooks \
- dnsmasq \
- dumpstate \
- dumpsys \
- framework \
- fsck_msdos \
- gralloc.default \
- gzip \
- ime \
- init \
- input \
- javax.obex \
- 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 \
- 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 \
- 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 \
- ping \
- platform.xml \
- pppd \
- pm \
- racoon \
- run-as \
- schedtest \
- screenshot \
- sdcard \
- service \
- servicemanager \
- services \
- surfaceflinger \
- svc \
- system_server \
- tc \
- toolbox \
- vdc \
- vold
-
PRODUCT_PACKAGES += \
ApplicationsProvider \
BackupRestoreConfirmation \
@@ -286,6 +155,7 @@
zoneinfo-host.version
endif
+
ifeq ($(HAVE_SELINUX),true)
PRODUCT_PACKAGES += \
sepolicy \
@@ -294,3 +164,5 @@
property_contexts \
mac_permissions.xml
endif
+
+$(call inherit-product, $(SRC_TARGET_DIR)/product/base.mk)
diff --git a/target/product/mini.mk b/target/product/mini.mk
index 668bf89..9684432 100644
--- a/target/product/mini.mk
+++ b/target/product/mini.mk
@@ -51,6 +51,7 @@
ro.config.notification_sound=OnTheHunt.ogg \
ro.config.alarm_alert=Alarm_Classic.ogg
+# Please keep this list sorted alphabetically
PRODUCT_PACKAGES += \
ApplicationsProvider \
ContactsProvider \
@@ -64,6 +65,8 @@
UserDictionaryProvider \
abcc \
apache-xml \
+ audio \
+ bluetoothd \
bouncycastle \
bu \
cacerts \
@@ -81,6 +84,7 @@
dx \
ext \
framework-res \
+ hciattach \
hprof-conv \
icu.dat \
installd \
@@ -138,9 +142,13 @@
libwebrtc_audio_preprocessing \
libwilhelm \
libz \
+ lint \
mdnsd \
+ network \
+ pand \
requestsync \
screencap \
+ sdptool \
sensorservice \
lint \
telephony-common \
@@ -211,6 +219,7 @@
ro.config.ringtone=Ring_Synth_04.ogg \
ro.config.notification_sound=pixiedust.ogg
+$(call inherit-product, $(SRC_TARGET_DIR)/product/base.mk)
$(call inherit-product-if-exists, frameworks/base/data/keyboards/keyboards.mk)
$(call inherit-product-if-exists, frameworks/base/data/fonts/fonts.mk)
$(call inherit-product-if-exists, frameworks/base/data/sounds/AudioPackage5.mk)
