From 3f9649492bdeb01f3a95350c28da11473beb00a0 Mon Sep 17 00:00:00 2001 From: Doug Zongker Date: Fri, 15 Feb 2013 14:01:03 -0800 Subject: factor core.mk product definition Split core.mk, which is currently set up for phones and tablets, into a core.mk and core_minimal.mk, so that non-phone devices can inherit from core_minimal. The only change to products that inherit from core.mk is removal of duplicated SELinux packages (which were present in both core.mk and embedded.mk). Change-Id: I6787bc42a6495c89ed63df7964512207a930d153 --- target/product/core.mk | 83 +++++------------------------------------ target/product/core_minimal.mk | 84 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+), 74 deletions(-) create mode 100644 target/product/core_minimal.mk (limited to 'target') diff --git a/target/product/core.mk b/target/product/core.mk index ddeec0b..ef640b8 100644 --- a/target/product/core.mk +++ b/target/product/core.mk @@ -14,93 +14,42 @@ # limitations under the License. # -PRODUCT_BRAND := generic -PRODUCT_DEVICE := generic -PRODUCT_NAME := core +# Base configuration for communication-oriented android devices +# (phones, tablets, etc.). If you want a change to apply to ALL +# devices (including non-phones and non-tablets), modify +# core_minimal.mk instead. PRODUCT_PROPERTY_OVERRIDES := \ ro.config.notification_sound=OnTheHunt.ogg \ ro.config.alarm_alert=Alarm_Classic.ogg PRODUCT_PACKAGES += \ - ApplicationsProvider \ - BackupRestoreConfirmation \ BasicDreams \ Browser \ Contacts \ ContactsProvider \ DefaultContainerService \ - DownloadProvider \ - DownloadProviderUi \ - HTMLViewer \ Home \ KeyChain \ - MediaProvider \ - PackageInstaller \ PicoTts \ - SettingsProvider \ SharedStorageBackup \ - Shell \ TelephonyProvider \ UserDictionaryProvider \ VpnDialogs \ abcc \ - apache-xml \ atrace \ - bouncycastle \ - bu \ - cacerts \ - com.android.location.provider \ - com.android.location.provider.xml \ - core \ - core-junit \ - dalvikvm \ - dexdeps \ - dexdump \ - dexlist \ - dexopt \ - dmtracedump \ - drmserver \ - dx \ - ext \ - framework-res \ - hprof-conv \ - icu.dat \ - installd \ - ip \ - ip-up-vpn \ - ip6tables \ - iptables \ - keystore \ - keystore.default \ libandroidfw \ - libOpenMAXAL \ - libOpenSLES \ libaudiopreprocessing \ libaudioutils \ libbcc \ - libcrypto \ - libdownmix \ - libdvm \ - libdrmframework \ - libdrmframework_jni \ - libexpat \ - libfilterfw \ libfilterpack_imageproc \ libgabi++ \ - libicui18n \ - libicuuc \ - libjavacore \ libkeystore \ libmdnssd \ - libnativehelper \ libnfc_ndef \ libportable \ libpowermanager \ libspeexresampler \ - libsqlite_jni \ - libssl \ - libstagefright \ libstagefright_chromium_http \ libstagefright_soft_aacdec \ libstagefright_soft_aacenc \ @@ -115,32 +64,18 @@ PRODUCT_PACKAGES += \ libstagefright_soft_mp3dec \ libstagefright_soft_mpeg4dec \ libstagefright_soft_mpeg4enc \ + libstagefright_soft_rawdec \ libstagefright_soft_vorbisdec \ libstagefright_soft_vpxdec \ libstagefright_soft_vpxenc \ - libstagefright_soft_rawdec \ libvariablespeed \ libwebrtc_audio_preprocessing \ - libwilhelm \ - libz \ - make_ext4fs \ + lint \ mdnsd \ + mms-common \ requestsync \ - screencap \ - sensorservice \ - lint \ - uiautomator \ telephony-common \ - voip-common \ - mms-common - -# SELinux packages -PRODUCT_PACKAGES += \ - sepolicy \ - file_contexts \ - seapp_contexts \ - property_contexts \ - mac_permissions.xml + voip-common # host-only dependencies ifeq ($(WITH_HOST_DALVIK),true) @@ -158,4 +93,4 @@ ifeq ($(WITH_HOST_DALVIK),true) dalvik endif -$(call inherit-product, $(SRC_TARGET_DIR)/product/base.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/core_minimal.mk) diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk new file mode 100644 index 0000000..96a8592 --- /dev/null +++ b/target/product/core_minimal.mk @@ -0,0 +1,84 @@ +# +# Copyright (C) 2013 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 configuration for most consumer android devices. Do not put +# things that are specific to communication devices (phones, tables, +# etc.) here -- for that, use core.mk. + +PRODUCT_BRAND := generic +PRODUCT_DEVICE := generic +PRODUCT_NAME := core + +PRODUCT_PACKAGES += \ + ApplicationsProvider \ + BackupRestoreConfirmation \ + DownloadProvider \ + DownloadProviderUi \ + HTMLViewer \ + MediaProvider \ + PackageInstaller \ + SettingsProvider \ + Shell \ + apache-xml \ + bouncycastle \ + bu \ + cacerts \ + com.android.location.provider \ + com.android.location.provider.xml \ + core \ + core-junit \ + dalvikvm \ + dexdeps \ + dexdump \ + dexlist \ + dexopt \ + dmtracedump \ + drmserver \ + dx \ + ext \ + framework-res \ + hprof-conv \ + icu.dat \ + installd \ + ip \ + ip-up-vpn \ + ip6tables \ + iptables \ + keystore \ + keystore.default \ + libOpenMAXAL \ + libOpenSLES \ + libcrypto \ + libdownmix \ + libdvm \ + libdrmframework \ + libdrmframework_jni \ + libexpat \ + libfilterfw \ + libicui18n \ + libicuuc \ + libjavacore \ + libnativehelper \ + libsqlite_jni \ + libssl \ + libwilhelm \ + libz \ + make_ext4fs \ + screencap \ + sensorservice \ + uiautomator + +$(call inherit-product, $(SRC_TARGET_DIR)/product/base.mk) -- cgit v1.1