external/svox is going away.
am: d068c58b80 -s ours
Change-Id: Icc7062196a227c75a89c4a222a4e14b9633a531f
diff --git a/products/atv_base.mk b/products/atv_base.mk
index 1241531..c5c37b0 100644
--- a/products/atv_base.mk
+++ b/products/atv_base.mk
@@ -43,6 +43,7 @@
libstagefright_soft_amrwbenc \
libstagefright_soft_avcdec \
libstagefright_soft_avcenc \
+ libstagefright_soft_flacdec \
libstagefright_soft_flacenc \
libstagefright_soft_g711dec \
libstagefright_soft_gsmdec \
@@ -124,7 +125,8 @@
PRODUCT_COPY_FILES += \
device/google/atv/tutorial-library-google.zip:system/media/tutorial-library-google.zip
-$(call inherit-product-if-exists, frameworks/base/data/sounds/AudioTv.mk)
+$(call inherit-product-if-exists, frameworks/base/data/sounds/AllAudio.mk)
+$(call inherit-product-if-exists, external/svox/pico/lang/all_pico_languages.mk)
$(call inherit-product-if-exists, frameworks/base/data/fonts/fonts.mk)
$(call inherit-product-if-exists, external/google-fonts/dancing-script/fonts.mk)
$(call inherit-product-if-exists, external/google-fonts/carrois-gothic-sc/fonts.mk)
diff --git a/products/sdk_atv_armv7.mk b/products/sdk_atv_armv7.mk
index e98ce70..2243f4e 100644
--- a/products/sdk_atv_armv7.mk
+++ b/products/sdk_atv_armv7.mk
@@ -59,6 +59,14 @@
$(call inherit-product, device/google/atv/products/atv_base.mk)
+# 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
+
# Overrides
PRODUCT_NAME := sdk_atv_armv7
PRODUCT_DEVICE := generic
diff --git a/tutorial-library-google.zip b/tutorial-library-google.zip
index fc1e2e9..5ae079b 100644
--- a/tutorial-library-google.zip
+++ b/tutorial-library-google.zip
Binary files differ
diff --git a/tutorial-library-google.zip.etag b/tutorial-library-google.zip.etag
index 38ee55a..30d88cf 100644
--- a/tutorial-library-google.zip.etag
+++ b/tutorial-library-google.zip.etag
@@ -1 +1 @@
-5e9e9a8c7faeca0d6ed5dbfd62772b99
+23b02ba5bfa5a14bd2d5212ea7d7571d
