EU configs in AOSPandroid-cts-2.1_r5android-cts-2.1_r4android-cts-2.1_r3android-cts-2.1_r2eclairdonut

Also consolidate some config files

9 files changed, 184 insertions, 66 deletions

diff --git a/products/AndroidProducts.mk b/products/AndroidProducts.mk
index 1bb43f0..d11d92f 100644
--- a/products/AndroidProducts.mk
+++ b/products/AndroidProducts.mk
@@ -27,5 +27,8 @@
 
 PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/aosp_emulator_us.mk \
+    $(LOCAL_DIR)/aosp_emulator_eu.mk \
     $(LOCAL_DIR)/aosp_dream_us.mk \
-    $(LOCAL_DIR)/aosp_sapphire_us.mk
+    $(LOCAL_DIR)/aosp_dream_eu.mk \
+    $(LOCAL_DIR)/aosp_sapphire_us.mk \
+    $(LOCAL_DIR)/aosp_sapphire_eu.mk
diff --git a/products/aosp_apps.mk b/products/aosp_apps.mk
deleted file mode 100644
index 5a417c5..0000000
--- a/products/aosp_apps.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# 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 the list of apps included in the generic AOSP build
-
-PRODUCT_PACKAGES := \
-    AlarmClock \
-    AlarmProvider \
-    ApplicationsProvider \
-    Browser \
-    Bugreport \
-    Calculator \
-    Calendar \
-    CalendarProvider \
-    Camera \
-    Contacts \
-    ContactsProvider \
-    DownloadProvider \
-    DrmProvider \
-    Email \
-    FieldTest \
-    GlobalSearch \
-    GoogleSearch \
-    HTMLViewer \
-    LatinIME \
-    Launcher \
-    MediaProvider \
-    Mms \
-    Music \
-    PackageInstaller \
-    Phone \
-    PicoTts \
-    Provision \
-    Settings \
-    SettingsProvider \
-    SoundRecorder \
-    SubscribedFeedsProvider \
-    Sync \
-    SyncProvider \
-    TelephonyProvider \
-    TtsService \
-    Updater \
-    UserDictionaryProvider \
-    VoiceDialer \
-    VpnServices \
-    WebSearchProvider \
-    framework-res
diff --git a/products/aosp_core.mk b/products/aosp_core.mk
index a32f0fe..7d5df93 100644
--- a/products/aosp_core.mk
+++ b/products/aosp_core.mk
@@ -17,8 +17,54 @@
 # This is the central build configuration file for AOSP builds
 
 $(call inherit-product, build/target/product/generic.mk)
-$(call inherit-product, vendor/aosp/products/aosp_apps.mk)
-$(call inherit-product, vendor/aosp/products/aosp_locales.mk)
 
+# This is the list of apps included in the generic AOSP build
+PRODUCT_PACKAGES := \
+    AlarmClock \
+    AlarmProvider \
+    ApplicationsProvider \
+    Browser \
+    Bugreport \
+    Calculator \
+    Calendar \
+    CalendarProvider \
+    Camera \
+    Contacts \
+    ContactsProvider \
+    DownloadProvider \
+    DrmProvider \
+    Email \
+    FieldTest \
+    GlobalSearch \
+    GoogleSearch \
+    HTMLViewer \
+    LatinIME \
+    Launcher \
+    MediaProvider \
+    Mms \
+    Music \
+    PackageInstaller \
+    Phone \
+    PicoTts \
+    Provision \
+    Settings \
+    SettingsProvider \
+    SoundRecorder \
+    SubscribedFeedsProvider \
+    Sync \
+    SyncProvider \
+    TelephonyProvider \
+    TtsService \
+    Updater \
+    UserDictionaryProvider \
+    VoiceDialer \
+    VpnServices \
+    WebSearchProvider \
+    framework-res
+
+# This is the list of locales included in AOSP builds
+PRODUCT_LOCALES := en_US en_GB fr_FR it_IT de_DE es_ES
+
+# Additional settings used in all AOSP builds
 PRODUCT_PROPERTY_OVERRIDES += \
         keyguard.no_require_sim=true
diff --git a/products/aosp_dream_eu.mk b/products/aosp_dream_eu.mk
new file mode 100644
index 0000000..bd68c6b
--- /dev/null
+++ b/products/aosp_dream_eu.mk
@@ -0,0 +1,36 @@
+#
+# 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 the config file for an actual configuration
+# AOSP on HTC Dream (ADP1), with EU settings
+
+$(call inherit-product, vendor/aosp/products/aosp_eu.mk)
+
+# How this product is called in the build system
+PRODUCT_NAME := aosp_dream_eu
+
+# Which actual hardware this is based on (this is a path under vendor/)
+PRODUCT_MANUFACTURER := htc
+PRODUCT_DEVICE := dream-open
+
+# The user-visible product name
+PRODUCT_MODEL := AOSP on Dream (EU)
+
+# Pick up some dream-EU-specific settings (gps and voice settings for EU).
+include vendor/htc/dream-open/device_dream_eu.mk
+
+# Pick up some sounds
+include frameworks/base/data/sounds/OriginalAudio.mk
diff --git a/products/aosp_emulator_eu.mk b/products/aosp_emulator_eu.mk
new file mode 100644
index 0000000..b1e69ff
--- /dev/null
+++ b/products/aosp_emulator_eu.mk
@@ -0,0 +1,32 @@
+#
+# 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 the config file for an actual configuration
+# AOSP on emulator, with EU settings
+
+$(call inherit-product, vendor/aosp/products/aosp_eu.mk)
+
+# How this product is called in the build system
+PRODUCT_NAME := aosp_emulator_eu
+
+# The user-visible product name
+PRODUCT_MODEL := AOSP (EU)
+
+PRODUCT_COPY_FILES := \
+        development/data/etc/vold.conf:system/etc/vold.conf
+
+# Pick up some sounds
+include frameworks/base/data/sounds/OriginalAudio.mk
diff --git a/products/aosp_emulator_us.mk b/products/aosp_emulator_us.mk
index 12ddf99..5ec254b 100644
--- a/products/aosp_emulator_us.mk
+++ b/products/aosp_emulator_us.mk
@@ -15,7 +15,7 @@
 #
 
 # This is the config file for an actual configuration
-# AOSP on HTC Dream (ADP1), with US settings
+# AOSP on emulator, with US settings
 
 $(call inherit-product, vendor/aosp/products/aosp_us.mk)
 
diff --git a/products/aosp_locales.mk b/products/aosp_eu.mk
index 21d9f62..81028e8 100644
--- a/products/aosp_locales.mk
+++ b/products/aosp_eu.mk
@@ -14,6 +14,18 @@
 # limitations under the License.
 #
 
-# This is the list of locales included in AOSP builds
+# This is the top-level configuration for an EU-configured AOSP build
 
-PRODUCT_LOCALES := en_US en_GB fr_FR it_IT de_DE es_ES
+$(call inherit-product, vendor/aosp/products/aosp_core.mk)
+
+PRODUCT_NAME := aosp_eu
+PRODUCT_BRAND := aosp
+PRODUCT_DEVICE := generic
+
+PRODUCT_PROPERTY_OVERRIDES += \
+	ro.com.android.dateformat=dd-MM-yyyy \
+        ro.com.android.dataroaming=true \
+        ro.ril.hsxpa=2 \
+        ro.ril.gprsclass=12
+
+PRODUCT_COPY_FILES += vendor/aosp/etc/apns-conf.xml:system/etc/apns-conf.xml
diff --git a/products/aosp_sapphire_eu.mk b/products/aosp_sapphire_eu.mk
new file mode 100644
index 0000000..0c08aa4
--- /dev/null
+++ b/products/aosp_sapphire_eu.mk
@@ -0,0 +1,44 @@
+#
+# 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 the config file for an actual configuration
+# AOSP on HTC Sapphire (ION), with EU settings
+
+$(call inherit-product, vendor/aosp/products/aosp_eu.mk)
+
+# How this product is called in the build system
+PRODUCT_NAME := aosp_sapphire_eu
+
+# Which actual hardware this is based on (this is a path under vendor/)
+PRODUCT_MANUFACTURER := htc
+PRODUCT_DEVICE := sapphire-open
+
+# The user-visible product name
+PRODUCT_MODEL := AOSP on Sapphire (EU)
+
+# Pick up some sapphire-US-specific settings (gps and voice settings for US).
+include vendor/htc/sapphire-open/device_sapphire_eu.mk
+
+# Pick up some sounds
+include frameworks/base/data/sounds/AudioPackage2.mk
+
+# TTS languages
+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/vendorsetup.sh b/vendorsetup.sh
index 861e963..a6b5306 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -21,8 +21,13 @@
 # function: add_lunch_combo generic-eng
 
 add_lunch_combo aosp_emulator_us-eng
+add_lunch_combo aosp_emulator_eu-eng
 add_lunch_combo aosp_dream_us-userdebug
+add_lunch_combo aosp_dream_eu-userdebug
 add_lunch_combo aosp_dream_us-eng
+add_lunch_combo aosp_dream_eu-eng
 add_lunch_combo aosp_sapphire_us-userdebug
+add_lunch_combo aosp_sapphire_eu-userdebug
 add_lunch_combo aosp_sapphire_us-eng
+add_lunch_combo aosp_sapphire_eu-eng