openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Move the old user tagged modules over to base.mk so mini and core both share them. 

Change-Id: I9d3a3c165fa56d4ca137b3c06e249e1deea6a1c5
This commit is contained in:
Joe Onorato 2012-07-23 18:20:07 -07:00
parent 88155422f2
commit c7d6f1ca1f
3 changed files with 159 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

147
target/product/base.mk Normal file
View File

@ -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

134
target/product/core.mk
View File

@ -22,137 +22,6 @@ PRODUCT_PROPERTY_OVERRIDES := \
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 @@ ifeq ($(WITH_HOST_DALVIK),true)
zoneinfo-host.version
endif
ifeq ($(HAVE_SELINUX),true)
PRODUCT_PACKAGES += \
sepolicy \
@ -294,3 +164,5 @@ ifeq ($(HAVE_SELINUX),true)
property_contexts \
mac_permissions.xml
endif
$(call inherit-product, $(SRC_TARGET_DIR)/product/base.mk)

9
target/product/mini.mk
View File

@ -51,6 +51,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
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 @@ PRODUCT_PACKAGES += \
UserDictionaryProvider \
abcc \
apache-xml \
audio \
bluetoothd \
bouncycastle \
bu \
cacerts \
@ -81,6 +84,7 @@ PRODUCT_PACKAGES += \
dx \
ext \
framework-res \
hciattach \
hprof-conv \
icu.dat \
installd \
@ -138,9 +142,13 @@ PRODUCT_PACKAGES += \
libwebrtc_audio_preprocessing \
libwilhelm \
libz \
lint \
mdnsd \
network \
pand \
requestsync \
screencap \
sdptool \
sensorservice \
lint \
telephony-common \
@ -211,6 +219,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
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)