Added option to include/exclude TTS langs and PRODUCT_LOCALES.

products/community_dream.mk

@@ -16,6 +16,10 @@
 
 # This is the top-level configuration for a US-configured HTC community build
 
+# Should core.mk include the TTS langs
+INCLUDE_TTS_LANGS := false
+INCLUDE_ALL_LOCALES := false
+
 $(call inherit-product, vendor/community/products/core.mk)
 
 PRODUCT_NAME := community_dream
@@ -32,7 +36,11 @@ TARGET_BUILD_TYPE := release
 PRODUCT_PACKAGE_OVERLAYS := vendor/community/overlay
 
 PRODUCT_LOCALES += \
-        mdpi
+        mdpi \
+	hdpi
+
+# Pick up some sounds
+include frameworks/base/data/sounds/OriginalAudio.mk
 
 # Pick up some hero settings (gps and voice settings).
 include vendor/community/dream/device.mk

products/community_hero_eu.mk

@@ -16,10 +16,14 @@
 
 # This is the top-level configuration for a EU-configured HTC Hero build
 
+# Should core.mk include the TTS langs
+INCLUDE_TTS_LANGS := true
+INCLUDE_ALL_LOCALES := true
+PRODUCT_REGION_EU := true
+
 $(call inherit-product, vendor/community/products/core.mk)
 
 PRODUCT_NAME := community_hero_eu
-PRODUCT_REGION_EU := true
 
 # Which actual hardware this is based on (this is a path under vendor/)
 PRODUCT_MANUFACTURER := htc
@@ -36,5 +40,8 @@ PRODUCT_LOCALES += \
 	mdpi \
 	hdpi
 
+# Pick up some sounds
+include frameworks/base/data/sounds/AudioPackage4.mk
+
 # Pick up some hero settings (gps and voice settings).
 include vendor/community/hero/device.mk

products/community_hero_us.mk

@@ -16,6 +16,10 @@
 
 # This is the top-level configuration for a US-configured HTC Hero build
 
+# Should core.mk include the TTS langs
+INCLUDE_TTS_LANGS := true
+INCLUDE_ALL_LOCALES := true
+
 $(call inherit-product, vendor/community/products/core.mk)
 
 PRODUCT_NAME := community_hero_us
@@ -35,5 +39,8 @@ PRODUCT_LOCALES += \
 	mdpi \
 	hdpi
 
+# Pick up some sounds
+include frameworks/base/data/sounds/AudioPackage4.mk
+
 # Pick up some hero settings (gps and voice settings).
 include vendor/community/hero/device.mk

products/community_liquid.mk

@@ -16,6 +16,10 @@
 
 # This is the top-level configuration for a US-configured loxMod build
 
+# Should core.mk include the TTS langs
+INCLUDE_TTS_LANGS := true
+INCLUDE_ALL_LOCALES := true
+
 $(call inherit-product, vendor/community/products/core.mk)
 
 PRODUCT_NAME := community_liquid
@@ -35,5 +39,8 @@ PRODUCT_LOCALES += \
         mdpi \
 	hdpi
 
+# Pick up some sounds
+include frameworks/base/data/sounds/AudioPackage4.mk
+
 # Pick up some liquid settings (gps and voice settings).
 include vendor/community/liquid/device.mk

products/core.mk

@@ -94,10 +94,15 @@ PRODUCT_COPY_FILES += \
 	vendor/community/etc/permissions/android.hardware.sensor.proximity.xml:system/etc/permissions/android.hardware.sensor.proximity.xml \
 	vendor/community/etc/permissions/android.hardware.sensor.light.xml:system/etc/permissions/android.hardware.sensor.light.xml \
 	vendor/community/etc/permissions/android.hardware.touchscreen.multitouch.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.xml
-   			  
-# This is the list of locales included in AOSP builds
+
+# Include en_US by default.
 PRODUCT_LOCALES := \
-	en_US \
+	en_US
+
+ifeq ($(INCLUDE_ALL_LOCALES),true)
+
+# This is the list of locales included in AOSP builds
+PRODUCT_LOCALES += \
 	en_AU \
 	en_CA \
 	en_GB \
@@ -156,13 +161,12 @@ PRODUCT_LOCALES := \
 	zh_CN \
 	zh_TW
 
+endif # INCLUDE_ALL_LOCALES
 # Force dex optimization (this may not work if you are on a Mac)
 WITH_DEXPREOPT := true
 DISABLE_DEXPREOPT := false
 
-
-# Pick up some sounds
-include frameworks/base/data/sounds/AudioPackage2.mk
+ifeq ($(INCLUDE_TTS_LANGS),true)
 
 # TTS languages
 include external/svox/pico/lang/PicoLangDeDeInSystem.mk
@@ -172,6 +176,8 @@ include external/svox/pico/lang/PicoLangEsEsInSystem.mk
 include external/svox/pico/lang/PicoLangFrFrInSystem.mk
 include external/svox/pico/lang/PicoLangItItInSystem.mk
 
+endif # INCLUDE_TTS_LANGS
+
 #
 # ADDITIONAL_BUILD_PROPERTIES
 #