summaryrefslogtreecommitdiffstats
path: root/target/product
diff options
context:
space:
mode:
Diffstat (limited to 'target/product')
-rw-r--r--target/product/AndroidProducts.mk3
-rw-r--r--target/product/core.mk52
-rw-r--r--target/product/full.mk2
-rw-r--r--target/product/full_base.mk15
-rw-r--r--target/product/full_base_telephony.mk30
-rw-r--r--target/product/full_x86.mk9
-rw-r--r--target/product/generic.mk31
-rw-r--r--target/product/generic_no_telephony.mk74
-rw-r--r--target/product/large_emu_hw.mk52
-rw-r--r--target/product/sdk.mk63
-rw-r--r--target/product/telephony.mk24
11 files changed, 266 insertions, 89 deletions
diff --git a/target/product/AndroidProducts.mk b/target/product/AndroidProducts.mk
index 6096a89..fafd222 100644
--- a/target/product/AndroidProducts.mk
+++ b/target/product/AndroidProducts.mk
@@ -41,5 +41,6 @@ PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/vbox_x86.mk \
$(LOCAL_DIR)/sdk.mk \
$(LOCAL_DIR)/sdk_x86.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..fb46516 100644
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -23,27 +23,48 @@ PRODUCT_PROPERTY_OVERRIDES := \
ro.config.alarm_alert=Alarm_Classic.ogg
PRODUCT_PACKAGES := \
+ ApplicationsProvider \
+ Browser \
+ Bugreport \
+ Contacts \
+ ContactsProvider \
+ DefaultContainerService \
+ DownloadProvider \
+ DownloadProviderUi \
+ HTMLViewer \
+ Home \
+ MediaProvider \
+ PackageInstaller \
+ PicoTts \
+ SettingsProvider \
+ TelephonyProvider \
+ TtsService \
+ UserDictionaryProvider \
+ VpnServices \
+ apache-xml \
bouncycastle \
com.android.location.provider \
com.android.location.provider.xml \
core \
core-junit \
- create_test_dmtrace \
dalvikvm \
dexdeps \
dexdump \
dexlist \
dexopt \
dmtracedump \
- dvz \
dx \
ext \
framework-res \
hprof-conv \
icu.dat \
+ installd \
+ ip \
ip-up-vpn \
- jasmin \
- jasmin.jar \
+ ip6tables \
+ iptables \
+ libOpenMAXAL \
+ libOpenSLES \
libcrypto \
libdex \
libdvm \
@@ -55,27 +76,11 @@ PRODUCT_PACKAGES := \
libnfc_ndef \
libsqlite_jni \
libssl \
+ libwilhelm \
libz \
+ screencap \
sqlite-jdbc \
- Browser \
- Contacts \
- Home \
- HTMLViewer \
- Phone \
- ApplicationsProvider \
- ContactsProvider \
- DownloadProvider \
- DownloadProviderUi \
- MediaProvider \
- PicoTts \
- SettingsProvider \
- TelephonyProvider \
- TtsService \
- VpnServices \
- UserDictionaryProvider \
- PackageInstaller \
- DefaultContainerService \
- Bugreport
+ wpa_supplicant.conf
# host-only dependencies
ifeq ($(WITH_HOST_DALVIK),true)
@@ -84,4 +89,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 8715e44..19f94ee 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 \
@@ -29,13 +30,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
@@ -44,7 +43,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 f23e988..d6a169a 100644
--- a/target/product/full_x86.mk
+++ b/target/product/full_x86.mk
@@ -19,8 +19,15 @@
# build quite specifically for the emulator, and might not be
# entirely appropriate to inherit from for on-device configurations.
+# If running on an emulator or some other device that has a LAN connection
+# that isn't a wifi connection. This will instruct init.rc to enable the
+# network connection so that you can use it with ADB
+ifdef NET_ETH0_STARTONBOOT
+ PRODUCT_PROPERTY_OVERRIDES += net.eth0.startonboot=1
+endif
+
$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
-$(call inherit-product, $(SRC_TARGET_DIR)/board/generic/device.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86/device.mk)
# Ensure we package the BIOS files too.
PRODUCT_PACKAGES += \
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..2a3aae7
--- /dev/null
+++ b/target/product/generic_no_telephony.mk
@@ -0,0 +1,74 @@
+#
+# 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 \
+ Exchange \
+ Gallery3D \
+ LatinIME \
+ Launcher2 \
+ Music \
+ Provision \
+ Phone \
+ QuickSearchBox \
+ Settings \
+ Sync \
+ SystemUI \
+ Updater \
+ CalendarProvider \
+ SyncProvider \
+ CryptKeeper
+
+PRODUCT_PACKAGES += \
+ icu.dat
+
+PRODUCT_PACKAGES += \
+ librs_jni \
+ libvideoeditor_jni \
+ libvideoeditorplayer \
+ libvideoeditor_core
+
+
+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-if-exists, frameworks/base/data/keyboards/keyboards.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..139a9da
--- /dev/null
+++ b/target/product/large_emu_hw.mk
@@ -0,0 +1,52 @@
+#
+# 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 \
+ Exchange \
+ 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 e6b8bd0..92de1b2 100644
--- a/target/product/sdk.mk
+++ b/target/product/sdk.mk
@@ -14,47 +14,53 @@
# limitations under the License.
#
+PRODUCT_POLICY := android.policy_phone
PRODUCT_PROPERTY_OVERRIDES :=
PRODUCT_PACKAGES := \
- SystemUI \
- AccountAndSyncSettings \
- Camera \
Calculator \
+ Camera \
DeskClock \
- Development \
- DrmProvider \
Email \
- Fallback \
+ Exchange \
Gallery \
- GPSEnable \
- Launcher2 \
- Protips \
Music \
Mms \
+ OpenWnn \
+ libWnnEngDic \
+ libWnnJpnDic \
+ libwnndict \
+ Phone \
+ PinyinIME \
+ Protips \
+ SoftKeyboard \
+ SystemUI \
+ Launcher2 \
+ AccountAndSyncSettings \
+ Development \
+ DrmProvider \
+ Fallback \
+ GPSEnable \
Settings \
SdkSetup \
CustomLocale \
gpstest \
sqlite3 \
LatinIME \
- PinyinIME \
- OpenWnn \
- libWnnEngDic \
- libWnnJpnDic \
- libwnndict \
CertInstaller \
LiveWallpapersPicker \
ApiDemos \
GestureBuilder \
- SoftKeyboard \
CubeLiveWallpapers \
QuickSearchBox \
+ WidgetPreview \
monkeyrunner \
guavalib \
jsr305lib \
jython \
- jsilver
+ jsilver \
+ librs_jni
+
# Host tools that are parts of the SDK.
# See development/build/sdk.atree
@@ -85,8 +91,8 @@ PRODUCT_PACKAGES += \
ddms \
ddmlib \
ddmuilib \
- hierarchyviewer \
draw9patch \
+ hierarchyviewer \
layoutopt \
uix \
traceview \
@@ -99,8 +105,6 @@ PRODUCT_PACKAGES += \
groovy-all-1.7.0 \
commons-compress-1.0 \
emmalib \
- org-netbeans-api-visual \
- org-openide-util \
jcommon-1.0.12 \
jfreechart-1.0.9 \
jfreechart-1.0.9-swt \
@@ -119,7 +123,6 @@ PRODUCT_PACKAGES += \
sdklib-tests \
sdkuilib-tests
-
PRODUCT_PACKAGE_OVERLAYS := development/sdk_overlay
PRODUCT_COPY_FILES := \
@@ -128,16 +131,22 @@ PRODUCT_COPY_FILES := \
frameworks/base/data/sounds/effects/VideoRecord.ogg:system/media/audio/ui/VideoRecord.ogg \
frameworks/base/data/etc/android.hardware.camera.autofocus.xml:system/etc/permissions/android.hardware.camera.autofocus.xml
+$(call inherit-product-if-exists, frameworks/base/data/fonts/fonts.mk)
+$(call inherit-product-if-exists, frameworks/base/data/keyboards/keyboards.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/core.mk)
# Overrides
PRODUCT_BRAND := generic
PRODUCT_NAME := sdk
PRODUCT_DEVICE := generic
-PRODUCT_LOCALES := \
+
+# locale + densities. en_US is both first and in alphabetical order to
+# ensure this is the default locale.
+PRODUCT_LOCALES = \
ldpi \
hdpi \
mdpi \
+ en_US \
ar_EG \
ar_IL \
bg_BG \
@@ -197,9 +206,9 @@ PRODUCT_LOCALES := \
zh_TW
# include available languages for TTS in the system image
-include external/svox/pico/lang/PicoLangDeDeInSystem.mk
-include external/svox/pico/lang/PicoLangEnGBInSystem.mk
-include external/svox/pico/lang/PicoLangEnUsInSystem.mk
-include external/svox/pico/lang/PicoLangEsEsInSystem.mk
-include external/svox/pico/lang/PicoLangFrFrInSystem.mk
-include external/svox/pico/lang/PicoLangItItInSystem.mk
+-include external/svox/pico/lang/PicoLangDeDeInSystem.mk
+-include external/svox/pico/lang/PicoLangEnGBInSystem.mk
+-include external/svox/pico/lang/PicoLangEnUsInSystem.mk
+-include external/svox/pico/lang/PicoLangEsEsInSystem.mk
+-include external/svox/pico/lang/PicoLangFrFrInSystem.mk
+-include external/svox/pico/lang/PicoLangItItInSystem.mk
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