diff --git a/target/board/generic/device.mk b/target/board/generic/device.mk new file mode 100644 index 0000000000..0b4dc271c8 --- /dev/null +++ b/target/board/generic/device.mk @@ -0,0 +1,26 @@ +# +# 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 the product aspects that +# are specific to the emulator. + +PRODUCT_PROPERTY_OVERRIDES := \ + 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 diff --git a/target/product/full.mk b/target/product/full.mk index 1c88500add..8231e994d9 100644 --- a/target/product/full.mk +++ b/target/product/full.mk @@ -19,19 +19,11 @@ # build quite specifically for the emulator, and might not be # entirely appropriate to inherit from for on-device configurations. -PRODUCT_PROPERTY_OVERRIDES := \ - 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 - -$(call inherit-product, $(SRC_TARGET_DIR)/product/full_no_telephony.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/generic.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/board/generic/device.mk) # Overrides PRODUCT_NAME := full -PRODUCT_BRAND := generic PRODUCT_DEVICE := generic -PRODUCT_MODEL := Full Android +PRODUCT_BRAND := Android +PRODUCT_MODEL := Full Android on Emulator diff --git a/target/product/full_base.mk b/target/product/full_base.mk new file mode 100644 index 0000000000..dbbd0cc79e --- /dev/null +++ b/target/product/full_base.mk @@ -0,0 +1,48 @@ +# +# 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 := \ + ro.com.android.dateformat=MM-dd-yyyy + +# Put en_US first in the list, so make it default. +PRODUCT_LOCALES := en_US + +# Pick up some sounds. +$(call inherit-product-if-exists, frameworks/base/data/sounds/AudioPackage4.mk) + +# Get the TTS language packs +$(call inherit-product-if-exists, external/svox/pico/lang/all_pico_languages.mk) + +# Get a list of languages. +$(call inherit-product, $(SRC_TARGET_DIR)/product/locales_full.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 0000000000..932ba95b27 --- /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 affdc13917..f137b8a44b 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 56dccc1547..dd0d663152 100644 --- a/target/product/generic.mk +++ b/target/product/generic.mk @@ -17,13 +17,8 @@ # This is a generic phone product that isn't specialized for a specific device. # It includes the base Android platform. -PRODUCT_PACKAGES := \ - Mms - -PRODUCT_COPY_FILES := \ - system/bluetooth/data/main.conf:system/etc/bluetooth/main.conf - $(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/telephony.mk b/target/product/telephony.mk new file mode 100644 index 0000000000..d55788735a --- /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