diff options
Diffstat (limited to 'target')
-rw-r--r-- | target/product/AndroidProducts.mk | 3 | ||||
-rw-r--r-- | target/product/core.mk | 7 | ||||
-rw-r--r-- | target/product/full.mk | 2 | ||||
-rw-r--r-- | target/product/full_base.mk | 15 | ||||
-rw-r--r-- | target/product/full_base_telephony.mk | 30 | ||||
-rw-r--r-- | target/product/full_x86.mk | 2 | ||||
-rw-r--r-- | target/product/generic.mk | 31 | ||||
-rw-r--r-- | target/product/generic_no_telephony.mk | 65 | ||||
-rw-r--r-- | target/product/large_emu_hw.mk | 51 | ||||
-rw-r--r-- | target/product/sdk.mk | 4 | ||||
-rw-r--r-- | target/product/telephony.mk | 24 |
11 files changed, 193 insertions, 41 deletions
diff --git a/target/product/AndroidProducts.mk b/target/product/AndroidProducts.mk index 32416c5..b27721a 100644 --- a/target/product/AndroidProducts.mk +++ b/target/product/AndroidProducts.mk @@ -39,5 +39,6 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/full.mk \ $(LOCAL_DIR)/full_x86.mk \ $(LOCAL_DIR)/sdk.mk \ - $(LOCAL_DIR)/sim.mk + $(LOCAL_DIR)/sim.mk \ + $(LOCAL_DIR)/large_emu_hw.mk endif diff --git a/target/product/core.mk b/target/product/core.mk index 55d6c26..e2e7d4b 100644 --- a/target/product/core.mk +++ b/target/product/core.mk @@ -57,11 +57,11 @@ PRODUCT_PACKAGES := \ libssl \ libz \ sqlite-jdbc \ + wpa_supplicant.conf \ Browser \ Contacts \ Home \ HTMLViewer \ - Phone \ ApplicationsProvider \ ContactsProvider \ DownloadProvider \ @@ -75,7 +75,9 @@ PRODUCT_PACKAGES := \ UserDictionaryProvider \ PackageInstaller \ DefaultContainerService \ - Bugreport + Bugreport \ + ip \ + screencap # host-only dependencies ifeq ($(WITH_HOST_DALVIK),true) @@ -84,4 +86,3 @@ ifeq ($(WITH_HOST_DALVIK),true) core-hostdex \ libjavacore-host endif - diff --git a/target/product/full.mk b/target/product/full.mk index c563bcc..8231e99 100644 --- a/target/product/full.mk +++ b/target/product/full.mk @@ -19,7 +19,7 @@ # build quite specifically for the emulator, and might not be # entirely appropriate to inherit from for on-device configurations. -$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk) $(call inherit-product, $(SRC_TARGET_DIR)/board/generic/device.mk) # Overrides diff --git a/target/product/full_base.mk b/target/product/full_base.mk index fb9b528..9ad45a9 100644 --- a/target/product/full_base.mk +++ b/target/product/full_base.mk @@ -15,8 +15,9 @@ # # This is a build configuration for a full-featured build of the -# Open-Source part of the tree. This is a base configuration to -# bes used for AOSP builds on various target devices. +# 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 \ @@ -28,13 +29,11 @@ PRODUCT_PACKAGES := \ # 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.config.ringtone=Ring_Synth_04.ogg \ ro.config.notification_sound=pixiedust.ogg -# Put en_US first in the list, to make it default. +# Put en_US first in the list, so make it default. PRODUCT_LOCALES := en_US # Get some sounds @@ -43,7 +42,9 @@ $(call inherit-product-if-exists, frameworks/base/data/sounds/AllAudio.mk) # Get the TTS language packs $(call inherit-product-if-exists, external/svox/pico/lang/all_pico_languages.mk) -# Get the list of languages. +# Get a list of languages. $(call inherit-product, $(SRC_TARGET_DIR)/product/locales_full.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/generic.mk) +# Get everything else from the parent package +$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_no_telephony.mk) + diff --git a/target/product/full_base_telephony.mk b/target/product/full_base_telephony.mk new file mode 100644 index 0000000..932ba95 --- /dev/null +++ b/target/product/full_base_telephony.mk @@ -0,0 +1,30 @@ +# +# 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 quite specifically for the emulator, and might not be +# entirely appropriate to inherit from for on-device configurations. + +PRODUCT_PROPERTY_OVERRIDES := \ + keyguard.no_require_sim=true \ + ro.com.android.dataroaming=true + +PRODUCT_COPY_FILES := \ + development/data/etc/apns-conf.xml:system/etc/apns-conf.xml + +$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony.mk) diff --git a/target/product/full_x86.mk b/target/product/full_x86.mk index affdc13..f137b8a 100644 --- a/target/product/full_x86.mk +++ b/target/product/full_x86.mk @@ -26,7 +26,7 @@ ifdef NET_ETH0_STARTONBOOT PRODUCT_PROPERTY_OVERRIDES += net.eth0.startonboot=1 endif -$(call inherit-product, build/target/product/full.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk) # Overrides PRODUCT_NAME := full_x86 diff --git a/target/product/generic.mk b/target/product/generic.mk index eed354a..dd0d663 100644 --- a/target/product/generic.mk +++ b/target/product/generic.mk @@ -14,36 +14,11 @@ # limitations under the License. # -# This is a generic product that isn't specialized for a specific device. +# This is a generic phone product that isn't specialized for a specific device. # It includes the base Android platform. -PRODUCT_PACKAGES := \ - AccountAndSyncSettings \ - DeskClock \ - AlarmProvider \ - Bluetooth \ - Calculator \ - Calendar \ - Camera \ - CertInstaller \ - DrmProvider \ - Email \ - Gallery3D \ - LatinIME \ - Launcher2 \ - Mms \ - Music \ - Provision \ - Protips \ - QuickSearchBox \ - Settings \ - Sync \ - SystemUI \ - Updater \ - CalendarProvider \ - SyncProvider - -$(call inherit-product, $(SRC_TARGET_DIR)/product/core.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_no_telephony.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/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..69e8d84 --- /dev/null +++ b/target/product/generic_no_telephony.mk @@ -0,0 +1,65 @@ +# +# 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 \ + 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 + +PRODUCT_COPY_FILES := \ + system/bluetooth/data/audio.conf:system/etc/bluetooth/audio.conf \ + system/bluetooth/data/auto_pairing.conf:system/etc/bluetooth/auto_pairing.conf \ + system/bluetooth/data/blacklist.conf:system/etc/bluetooth/blacklist.conf \ + system/bluetooth/data/input.conf:system/etc/bluetooth/input.conf \ + system/bluetooth/data/main.nonsmartphone.conf:system/etc/bluetooth/main.conf \ + system/bluetooth/data/network.conf:system/etc/bluetooth/network.conf + +$(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 new file mode 100644 index 0000000..07991ac --- /dev/null +++ b/target/product/large_emu_hw.mk @@ -0,0 +1,51 @@ +# +# 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 product for devices with large display but not specialized +# for a specific device. It includes the base Android platform. + +PRODUCT_POLICY := android.policy_mid + +PRODUCT_PACKAGES := \ + AccountAndSyncSettings \ + CarHome \ + DeskClock \ + AlarmProvider \ + Bluetooth \ + Calculator \ + Calendar \ + Camera \ + CertInstaller \ + DrmProvider \ + Email \ + Gallery3D \ + LatinIME \ + Launcher2 \ + Music \ + Provision \ + QuickSearchBox \ + Settings \ + Sync \ + Updater \ + CalendarProvider \ + SyncProvider + +$(call inherit-product, $(SRC_TARGET_DIR)/product/core.mk) + +# Overrides +PRODUCT_BRAND := generic +PRODUCT_DEVICE := generic +PRODUCT_NAME := large_emu_hw diff --git a/target/product/sdk.mk b/target/product/sdk.mk index 7a986bd..a8aecac 100644 --- a/target/product/sdk.mk +++ b/target/product/sdk.mk @@ -14,6 +14,7 @@ # limitations under the License. # +PRODUCT_POLICY := android.policy_phone PRODUCT_PROPERTY_OVERRIDES := PRODUCT_PACKAGES := \ @@ -39,6 +40,7 @@ PRODUCT_PACKAGES := \ sqlite3 \ LatinIME \ PinyinIME \ + Phone \ OpenWnn \ libWnnEngDic \ libWnnJpnDic \ @@ -121,6 +123,8 @@ PRODUCT_COPY_FILES := \ $(call inherit-product, $(SRC_TARGET_DIR)/product/core.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/locales_full.mk) + # Overrides PRODUCT_BRAND := generic PRODUCT_NAME := sdk diff --git a/target/product/telephony.mk b/target/product/telephony.mk new file mode 100644 index 0000000..d557887 --- /dev/null +++ b/target/product/telephony.mk @@ -0,0 +1,24 @@ +# +# 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 the list of product-level settings that are specific +# to products that have telephony hardware. + +PRODUCT_PACKAGES := \ + Mms + +PRODUCT_COPY_FILES := \ + system/bluetooth/data/main.conf:system/etc/bluetooth/main.conf |