Manual merge of c90f05ad

"Clean up makefiles for TTS data files."

Change-Id: I45a8f9887159de4d051455fc3feb202c26b9b8ce

8 files changed, 36 insertions, 28 deletions

diff --git a/pico/lang/PicoLangDeDeInSystem.mk b/pico/lang/PicoLangDeDeInSystem.mk
index 174bc1b..581964b 100644
--- a/pico/lang/PicoLangDeDeInSystem.mk
+++ b/pico/lang/PicoLangDeDeInSystem.mk
@@ -6,9 +6,7 @@
 # Note the destination path matches that used in external/svox/pico/tts/com_svox_picottsengine.cpp
 # 
 
-LOCAL_PATH:= external/svox/pico/lang
-
 PRODUCT_COPY_FILES += \
-	$(LOCAL_PATH)/de-DE_gl0_sg.bin:system/tts/lang_pico/de-DE_gl0_sg.bin \
-	$(LOCAL_PATH)/de-DE_ta.bin:system/tts/lang_pico/de-DE_ta.bin
+	external/svox/pico/lang/de-DE_gl0_sg.bin:system/tts/lang_pico/de-DE_gl0_sg.bin \
+	external/svox/pico/lang/de-DE_ta.bin:system/tts/lang_pico/de-DE_ta.bin
 
diff --git a/pico/lang/PicoLangDefaultInSystem.mk b/pico/lang/PicoLangDefaultInSystem.mk
index 5e31e82..9f33406 100644
--- a/pico/lang/PicoLangDefaultInSystem.mk
+++ b/pico/lang/PicoLangDefaultInSystem.mk
@@ -6,9 +6,7 @@
 # Note the destination path matches that used in external/svox/pico/tts/com_svox_picottsengine.cpp
 # 
 
-LOCAL_PATH:= external/svox/pico/lang
-
 PRODUCT_COPY_FILES += \
-	$(LOCAL_PATH)/en-US_lh0_sg.bin:system/tts/lang_pico/en-US_lh0_sg.bin \
-	$(LOCAL_PATH)/en-US_ta.bin:system/tts/lang_pico/en-US_ta.bin
+	external/svox/pico/lang/en-US_lh0_sg.bin:system/tts/lang_pico/en-US_lh0_sg.bin \
+	external/svox/pico/lang/en-US_ta.bin:system/tts/lang_pico/en-US_ta.bin
 
diff --git a/pico/lang/PicoLangEnGBInSystem.mk b/pico/lang/PicoLangEnGBInSystem.mk
index a07f50e..31c55d9 100644
--- a/pico/lang/PicoLangEnGBInSystem.mk
+++ b/pico/lang/PicoLangEnGBInSystem.mk
@@ -6,9 +6,7 @@
 # Note the destination path matches that used in external/svox/pico/tts/com_svox_picottsengine.cpp
 # 
 
-LOCAL_PATH:= external/svox/pico/lang
-
 PRODUCT_COPY_FILES += \
-	$(LOCAL_PATH)/en-GB_kh0_sg.bin:system/tts/lang_pico/en-GB_kh0_sg.bin \
-	$(LOCAL_PATH)/en-GB_ta.bin:system/tts/lang_pico/en-GB_ta.bin
+	external/svox/pico/lang/en-GB_kh0_sg.bin:system/tts/lang_pico/en-GB_kh0_sg.bin \
+	external/svox/pico/lang/en-GB_ta.bin:system/tts/lang_pico/en-GB_ta.bin
 
diff --git a/pico/lang/PicoLangEnUsInSystem.mk b/pico/lang/PicoLangEnUsInSystem.mk
index 5ac7646..c206d09 100644
--- a/pico/lang/PicoLangEnUsInSystem.mk
+++ b/pico/lang/PicoLangEnUsInSystem.mk
@@ -6,9 +6,7 @@
 # Note the destination path matches that used in external/svox/pico/tts/com_svox_picottsengine.cpp
 # 
 
-LOCAL_PATH:= external/svox/pico/lang
-
 PRODUCT_COPY_FILES += \
-	$(LOCAL_PATH)/en-US_lh0_sg.bin:system/tts/lang_pico/en-US_lh0_sg.bin \
-	$(LOCAL_PATH)/en-US_ta.bin:system/tts/lang_pico/en-US_ta.bin
+	external/svox/pico/lang/en-US_lh0_sg.bin:system/tts/lang_pico/en-US_lh0_sg.bin \
+	external/svox/pico/lang/en-US_ta.bin:system/tts/lang_pico/en-US_ta.bin
 
diff --git a/pico/lang/PicoLangEsEsInSystem.mk b/pico/lang/PicoLangEsEsInSystem.mk
index 49165f2..da80e80 100644
--- a/pico/lang/PicoLangEsEsInSystem.mk
+++ b/pico/lang/PicoLangEsEsInSystem.mk
@@ -6,9 +6,7 @@
 # Note the destination path matches that used in external/svox/pico/tts/com_svox_picottsengine.cpp
 # 
 
-LOCAL_PATH:= external/svox/pico/lang
-
 PRODUCT_COPY_FILES += \
-	$(LOCAL_PATH)/es-ES_zl0_sg.bin:system/tts/lang_pico/es-ES_zl0_sg.bin \
-	$(LOCAL_PATH)/es-ES_ta.bin:system/tts/lang_pico/es-ES_ta.bin
+	external/svox/pico/lang/es-ES_zl0_sg.bin:system/tts/lang_pico/es-ES_zl0_sg.bin \
+	external/svox/pico/lang/es-ES_ta.bin:system/tts/lang_pico/es-ES_ta.bin
 
diff --git a/pico/lang/PicoLangFrFrInSystem.mk b/pico/lang/PicoLangFrFrInSystem.mk
index 619a0cf..bdbda66 100644
--- a/pico/lang/PicoLangFrFrInSystem.mk
+++ b/pico/lang/PicoLangFrFrInSystem.mk
@@ -6,9 +6,7 @@
 # Note the destination path matches that used in external/svox/pico/tts/com_svox_picottsengine.cpp
 # 
 
-LOCAL_PATH:= external/svox/pico/lang
-
 PRODUCT_COPY_FILES += \
-	$(LOCAL_PATH)/fr-FR_nk0_sg.bin:system/tts/lang_pico/fr-FR_nk0_sg.bin \
-	$(LOCAL_PATH)/fr-FR_ta.bin:system/tts/lang_pico/fr-FR_ta.bin
+	external/svox/pico/lang/fr-FR_nk0_sg.bin:system/tts/lang_pico/fr-FR_nk0_sg.bin \
+	external/svox/pico/lang/fr-FR_ta.bin:system/tts/lang_pico/fr-FR_ta.bin
 
diff --git a/pico/lang/PicoLangItItInSystem.mk b/pico/lang/PicoLangItItInSystem.mk
index c10cf36..d13e61c 100644
--- a/pico/lang/PicoLangItItInSystem.mk
+++ b/pico/lang/PicoLangItItInSystem.mk
@@ -6,9 +6,7 @@
 # Note the destination path matches that used in external/svox/pico/tts/com_svox_picottsengine.cpp
 # 
 
-LOCAL_PATH:= external/svox/pico/lang
-
 PRODUCT_COPY_FILES += \
-	$(LOCAL_PATH)/it-IT_cm0_sg.bin:system/tts/lang_pico/it-IT_cm0_sg.bin \
-	$(LOCAL_PATH)/it-IT_ta.bin:system/tts/lang_pico/it-IT_ta.bin
+	external/svox/pico/lang/it-IT_cm0_sg.bin:system/tts/lang_pico/it-IT_cm0_sg.bin \
+	external/svox/pico/lang/it-IT_ta.bin:system/tts/lang_pico/it-IT_ta.bin
 
diff --git a/pico/lang/all_pico_languages.mk b/pico/lang/all_pico_languages.mk
new file mode 100644
index 0000000..2b0cd7e
--- /dev/null
+++ b/pico/lang/all_pico_languages.mk
@@ -0,0 +1,22 @@
+# Copyright (C) 2010 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 file simply inherits from all the know language packs.
+
+$(call inherit-product, external/svox/pico/lang/PicoLangDeDeInSystem.mk)
+$(call inherit-product, external/svox/pico/lang/PicoLangEnGBInSystem.mk)
+$(call inherit-product, external/svox/pico/lang/PicoLangEnUsInSystem.mk)
+$(call inherit-product, external/svox/pico/lang/PicoLangEsEsInSystem.mk)
+$(call inherit-product, external/svox/pico/lang/PicoLangFrFrInSystem.mk)
+$(call inherit-product, external/svox/pico/lang/PicoLangItItInSystem.mk)