diff options
author | Ying Wang <wangying@google.com> | 2010-09-21 16:08:26 -0700 |
---|---|---|
committer | Ying Wang <wangying@google.com> | 2010-09-21 16:28:29 -0700 |
commit | 03e76ace38fde4ab1719a9702bb6e5d9185caaae (patch) | |
tree | d0254920e85dbbe79f5d10c03a79d9518cd0a994 | |
parent | 9ce0fb6e59415669074896cfa01e1f0cf97979b7 (diff) | |
download | build-03e76ace38fde4ab1719a9702bb6e5d9185caaae.zip build-03e76ace38fde4ab1719a9702bb6e5d9185caaae.tar.gz build-03e76ace38fde4ab1719a9702bb6e5d9185caaae.tar.bz2 |
Add a new layer generic_no_telephony.mk
Bug: 2994028
Change-Id: I2a1831bb8dd1245c6cc0116738c118fe895b6e43
-rw-r--r-- | target/product/full.mk | 24 | ||||
-rw-r--r-- | target/product/full_no_telephony.mk | 42 | ||||
-rw-r--r-- | target/product/generic.mk | 35 | ||||
-rw-r--r-- | target/product/generic_no_telephony.mk | 58 | ||||
-rw-r--r-- | target/product/large_emu_hw.mk | 1 |
5 files changed, 105 insertions, 55 deletions
diff --git a/target/product/full.mk b/target/product/full.mk index 77619a6..3e55d5e 100644 --- a/target/product/full.mk +++ b/target/product/full.mk @@ -19,37 +19,19 @@ # build of the emulator, but all those aspects can be overridden # in inherited configurations. -PRODUCT_PACKAGES := \ - OpenWnn \ - PinyinIME \ - VoiceDialer \ - libWnnEngDic \ - libWnnJpnDic \ - libwnndict - -# Additional settings used in all AOSP builds PRODUCT_PROPERTY_OVERRIDES := \ - keyguard.no_require_sim=true \ - ro.com.android.dateformat=MM-dd-yyyy \ ro.com.android.dataroaming=true \ ro.ril.hsxpa=1 \ ro.ril.gprsclass=10 PRODUCT_COPY_FILES := \ - development/data/etc/apns-conf.xml:system/etc/apns-conf.xml \ - development/data/etc/vold.conf:system/etc/vold.conf - -# Pick up some sounds. -$(call inherit-product, frameworks/base/data/sounds/AudioPackage4.mk) + development/data/etc/apns-conf.xml:system/etc/apns-conf.xml -# Get a list of languages. -$(call inherit-product, build/target/product/locales_full.mk) - -$(call inherit-product, build/target/product/generic.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/full_no_telephony.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/generic.mk) # Overrides PRODUCT_NAME := full PRODUCT_BRAND := generic PRODUCT_DEVICE := generic PRODUCT_MODEL := Full Android - diff --git a/target/product/full_no_telephony.mk b/target/product/full_no_telephony.mk new file mode 100644 index 0000000..cc497ef --- /dev/null +++ b/target/product/full_no_telephony.mk @@ -0,0 +1,42 @@ +# +# Copyright (C) 2009 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. +# + +# This is a build configuration for a full-featured build of the +# Open-Source part of the tree. It's geared toward a US-centric +# build of the emulator, but all those aspects can be overridden +# in inherited configurations. + +PRODUCT_PACKAGES := \ + OpenWnn \ + PinyinIME \ + VoiceDialer \ + libWnnEngDic \ + libWnnJpnDic \ + libwnndict + +# Additional settings used in all AOSP builds +PRODUCT_PROPERTY_OVERRIDES := \ + keyguard.no_require_sim=true \ + ro.com.android.dateformat=MM-dd-yyyy + +PRODUCT_COPY_FILES := \ + development/data/etc/vold.conf:system/etc/vold.conf + +# Pick up some sounds. +$(call inherit-product, frameworks/base/data/sounds/AudioPackage4.mk) + +# Get a list of languages. +$(call inherit-product, $(SRC_TARGET_DIR)/product/locales_full.mk) diff --git a/target/product/generic.mk b/target/product/generic.mk index 9bb794c..5dfd46f 100644 --- a/target/product/generic.mk +++ b/target/product/generic.mk @@ -17,41 +17,10 @@ # This is a generic phone product that isn't specialized for a specific device. # It includes the base Android platform. -PRODUCT_POLICY := android.policy_phone - PRODUCT_PACKAGES := \ - AccountAndSyncSettings \ - CarHome \ - DeskClock \ - AlarmProvider \ - Bluetooth \ - Calculator \ - Calendar \ - Camera \ - CertInstaller \ - DrmProvider \ - Email \ - Gallery3D \ - LatinIME \ - Launcher2 \ - Mms \ - Music \ - Provision \ - Phone \ - Protips \ - QuickSearchBox \ - Settings \ - Sync \ - SystemUI \ - Updater \ - CalendarProvider \ - SyncProvider - -PRODUCT_PACKAGES += \ - icu.dat + Mms -$(call inherit-product-if-exists, frameworks/base/data/fonts/fonts.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/core.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_no_telephony.mk) # Overrides PRODUCT_BRAND := generic diff --git a/target/product/generic_no_telephony.mk b/target/product/generic_no_telephony.mk new file mode 100644 index 0000000..d154bc9 --- /dev/null +++ b/target/product/generic_no_telephony.mk @@ -0,0 +1,58 @@ +# +# Copyright (C) 2007 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. +# + +# This is a generic phone product that isn't specialized for a specific device. +# It includes the base Android platform. + +PRODUCT_POLICY := android.policy_phone + +PRODUCT_PACKAGES := \ + AccountAndSyncSettings \ + CarHome \ + DeskClock \ + AlarmProvider \ + Bluetooth \ + Calculator \ + Calendar \ + Camera \ + CertInstaller \ + DrmProvider \ + Email \ + Gallery3D \ + LatinIME \ + Launcher2 \ + Music \ + Provision \ + Phone \ + Protips \ + QuickSearchBox \ + Settings \ + Sync \ + SystemUI \ + Updater \ + CalendarProvider \ + SyncProvider + +PRODUCT_PACKAGES += \ + icu.dat + +$(call inherit-product-if-exists, frameworks/base/data/fonts/fonts.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/core.mk) + +# Overrides +PRODUCT_BRAND := generic +PRODUCT_DEVICE := generic +PRODUCT_NAME := generic_no_telephony diff --git a/target/product/large_emu_hw.mk b/target/product/large_emu_hw.mk index 6aadc23..07991ac 100644 --- a/target/product/large_emu_hw.mk +++ b/target/product/large_emu_hw.mk @@ -34,7 +34,6 @@ PRODUCT_PACKAGES := \ Gallery3D \ LatinIME \ Launcher2 \ - Mms \ Music \ Provision \ QuickSearchBox \ |