Merge "Disable external/svox."
diff --git a/Android.mk b/Android.mk
deleted file mode 100755
index 720c834..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(LOCAL_PATH)/pico/Android.mk
diff --git a/CleanSpec.mk b/CleanSpec.mk
deleted file mode 100644
index b84e1b6..0000000
--- a/CleanSpec.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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.
-#
-
-# If you don't need to do a full clean build but would like to touch
-# a file or delete some intermediate files, add a clean step to the end
-# of the list. These steps will only be run once, if they haven't been
-# run before.
-#
-# E.g.:
-# $(call add-clean-step, touch -c external/sqlite/sqlite3.h)
-# $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates)
-#
-# Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with
-# files that are missing or have been moved.
-#
-# Use $(PRODUCT_OUT) to get to the "out/target/product/blah/" directory.
-# Use $(OUT_DIR) to refer to the "out" directory.
-#
-# If you need to re-do something that's already mentioned, just copy
-# the command and add it to the bottom of the list. E.g., if a change
-# that you made last week required touching a file and a change you
-# made today requires touching the same file, just copy the old
-# touch step and add it to the end of the list.
-#
-# ************************************************
-# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
-# ************************************************
-
-# For example:
-#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/AndroidTests_intermediates)
-#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates)
-#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)
-#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
-
-# ************************************************
-# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
-# ************************************************
diff --git a/PicoLangInstallerDeuDeu/Android.mk b/PicoLangInstallerDeuDeu/Android.mk
deleted file mode 100755
index a1c529f..0000000
--- a/PicoLangInstallerDeuDeu/Android.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-
-LOCAL_PACKAGE_NAME := PicoLangInstaller
-
-include $(BUILD_PACKAGE)
diff --git a/PicoLangInstallerEngGbr/Android.mk b/PicoLangInstallerEngGbr/Android.mk
deleted file mode 100755
index a1c529f..0000000
--- a/PicoLangInstallerEngGbr/Android.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-
-LOCAL_PACKAGE_NAME := PicoLangInstaller
-
-include $(BUILD_PACKAGE)
diff --git a/PicoLangInstallerEngUsa/Android.mk b/PicoLangInstallerEngUsa/Android.mk
deleted file mode 100755
index a1c529f..0000000
--- a/PicoLangInstallerEngUsa/Android.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-
-LOCAL_PACKAGE_NAME := PicoLangInstaller
-
-include $(BUILD_PACKAGE)
diff --git a/PicoLangInstallerFraFra/Android.mk b/PicoLangInstallerFraFra/Android.mk
deleted file mode 100755
index a1c529f..0000000
--- a/PicoLangInstallerFraFra/Android.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-
-LOCAL_PACKAGE_NAME := PicoLangInstaller
-
-include $(BUILD_PACKAGE)
diff --git a/PicoLangInstallerItaIta/Android.mk b/PicoLangInstallerItaIta/Android.mk
deleted file mode 100755
index a1c529f..0000000
--- a/PicoLangInstallerItaIta/Android.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-
-LOCAL_PACKAGE_NAME := PicoLangInstaller
-
-include $(BUILD_PACKAGE)
diff --git a/PicoLangInstallerSpaEsp/Android.mk b/PicoLangInstallerSpaEsp/Android.mk
deleted file mode 100755
index a1c529f..0000000
--- a/PicoLangInstallerSpaEsp/Android.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-
-LOCAL_PACKAGE_NAME := PicoLangInstaller
-
-include $(BUILD_PACKAGE)
diff --git a/pico/Android.mk b/pico/Android.mk
deleted file mode 100755
index e35e6be..0000000
--- a/pico/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# SVOX Pico TTS Engine
-# This makefile builds both an activity and a shared library.
-
-#disable build in PDK
-ifneq ($(TARGET_BUILD_PDK),true)
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := PicoTts
-LOCAL_MULTILIB := 32
-
-LOCAL_SRC_FILES := \
- $(call all-java-files-under, src) \
- $(call all-java-files-under, compat)
-
-LOCAL_JNI_SHARED_LIBRARIES := libttscompat libttspico
-LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-
-include $(BUILD_PACKAGE)
-
-
-include $(LOCAL_PATH)/compat/jni/Android.mk \
- $(LOCAL_PATH)/lib/Android.mk \
- $(LOCAL_PATH)/tts/Android.mk
-
-endif #TARGET_BUILD_PDK
diff --git a/pico/compat/jni/Android.mk b/pico/compat/jni/Android.mk
deleted file mode 100755
index 55ebe5e..0000000
--- a/pico/compat/jni/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE:= libttscompat
-LOCAL_MULTILIB := 32
-
-LOCAL_SRC_FILES:= \
- com_android_tts_compat_SynthProxy.cpp
-
-LOCAL_C_INCLUDES += \
- frameworks/base/native/include \
- $(JNI_H_INCLUDE)
-
-LOCAL_SHARED_LIBRARIES := \
- libandroid_runtime \
- libnativehelper \
- libmedia \
- libutils \
- libcutils \
- liblog \
- libdl
-
-LOCAL_CFLAGS := \
- -Wall -Werror \
- -Wno-unused-parameter
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/pico/lang/PicoLangDeDeInSystem.mk b/pico/lang/PicoLangDeDeInSystem.mk
deleted file mode 100644
index 581964b..0000000
--- a/pico/lang/PicoLangDeDeInSystem.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Installation of de-DE for the Pico TTS engine in the system image
-#
-# Include this file in a product makefile to include the language files for de-DE
-#
-# Note the destination path matches that used in external/svox/pico/tts/com_svox_picottsengine.cpp
-#
-
-PRODUCT_COPY_FILES += \
- 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
deleted file mode 100644
index 9f33406..0000000
--- a/pico/lang/PicoLangDefaultInSystem.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Installation of a default language for the Pico TTS engine
-#
-# Include this file in a product makefile to include the language files for english US
-#
-# Note the destination path matches that used in external/svox/pico/tts/com_svox_picottsengine.cpp
-#
-
-PRODUCT_COPY_FILES += \
- 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
deleted file mode 100644
index 31c55d9..0000000
--- a/pico/lang/PicoLangEnGBInSystem.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Installation of en-GB for the Pico TTS engine in the system image
-#
-# Include this file in a product makefile to include the language files for en-GB
-#
-# Note the destination path matches that used in external/svox/pico/tts/com_svox_picottsengine.cpp
-#
-
-PRODUCT_COPY_FILES += \
- 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
deleted file mode 100644
index c206d09..0000000
--- a/pico/lang/PicoLangEnUsInSystem.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Installation of en-US for the Pico TTS engine in the system image
-#
-# Include this file in a product makefile to include the language files for english US
-#
-# Note the destination path matches that used in external/svox/pico/tts/com_svox_picottsengine.cpp
-#
-
-PRODUCT_COPY_FILES += \
- 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
deleted file mode 100644
index da80e80..0000000
--- a/pico/lang/PicoLangEsEsInSystem.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Installation of es-ES for the Pico TTS engine in the system image
-#
-# Include this file in a product makefile to include the language files for es-ES
-#
-# Note the destination path matches that used in external/svox/pico/tts/com_svox_picottsengine.cpp
-#
-
-PRODUCT_COPY_FILES += \
- 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
deleted file mode 100644
index bdbda66..0000000
--- a/pico/lang/PicoLangFrFrInSystem.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Installation of fr-FR for the Pico TTS engine in the system image
-#
-# Include this file in a product makefile to include the language files for fr-FR
-#
-# Note the destination path matches that used in external/svox/pico/tts/com_svox_picottsengine.cpp
-#
-
-PRODUCT_COPY_FILES += \
- 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
deleted file mode 100644
index d13e61c..0000000
--- a/pico/lang/PicoLangItItInSystem.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Installation of it-IT for the Pico TTS engine in the system image
-#
-# Include this file in a product makefile to include the language files for it-IT
-#
-# Note the destination path matches that used in external/svox/pico/tts/com_svox_picottsengine.cpp
-#
-
-PRODUCT_COPY_FILES += \
- 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
deleted file mode 100644
index 2b0cd7e..0000000
--- a/pico/lang/all_pico_languages.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# 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)
diff --git a/pico/lib/Android.mk b/pico/lib/Android.mk
deleted file mode 100644
index c00932f..0000000
--- a/pico/lib/Android.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-# Build Base Generic SVOX Pico Library
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libsvoxpico
-LOCAL_MULTILIB := 32
-
-LOCAL_SRC_FILES := \
- picoacph.c \
- picoapi.c \
- picobase.c \
- picocep.c \
- picoctrl.c \
- picodata.c \
- picodbg.c \
- picoextapi.c \
- picofftsg.c \
- picokdbg.c \
- picokdt.c \
- picokfst.c \
- picoklex.c \
- picoknow.c \
- picokpdf.c \
- picokpr.c \
- picoktab.c \
- picoos.c \
- picopal.c \
- picopam.c \
- picopr.c \
- picorsrc.c \
- picosa.c \
- picosig.c \
- picosig2.c \
- picospho.c \
- picotok.c \
- picotrns.c \
- picowa.c
-
-LOCAL_CFLAGS+= $(TOOL_CFLAGS)
-LOCAL_LDFLAGS+= $(TOOL_LDFLAGS)
-
-LOCAL_CFLAGS += \
- -Wall -Werror \
- -Wno-error=infinite-recursion \
- -Wno-parentheses-equality \
- -Wno-self-assign \
- -Wno-sign-compare \
- -Wno-unneeded-internal-declaration \
- -Wno-unused-parameter \
-
-include $(BUILD_STATIC_LIBRARY)
-
-
-
-
diff --git a/pico/tts/Android.mk b/pico/tts/Android.mk
deleted file mode 100644
index 8eb827d..0000000
--- a/pico/tts/Android.mk
+++ /dev/null
@@ -1,65 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-svox_tts_warn_flags := \
- -Wall -Werror \
- -Wno-sign-compare \
- -Wno-unused-const-variable \
- -Wno-unused-parameter \
-
-# Build static library containing all PICO code
-# excluding the compatibility code. This is identical
-# to the rule below / except that it builds a shared
-# library.
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libttspico_engine
-LOCAL_MULTILIB := 32
-
-LOCAL_CFLAGS := $(svox_tts_warn_flags)
-
-LOCAL_SRC_FILES := \
- com_svox_picottsengine.cpp \
- svox_ssml_parser.cpp
-
-LOCAL_C_INCLUDES += \
- external/svox/pico/lib \
- external/svox/pico/compat/include
-
-LOCAL_STATIC_LIBRARIES := libsvoxpico
-
-LOCAL_SHARED_LIBRARIES := \
- libcutils \
- libexpat \
- libutils \
- liblog
-
-LOCAL_ARM_MODE := arm
-
-include $(BUILD_STATIC_LIBRARY)
-
-
-# Build Pico Shared Library. This rule is used by the
-# compatibility code, which opens this shared library
-# using dlsym. This is essentially the same as the rule
-# above, except that it packages things a shared library.
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libttspico
-LOCAL_MULTILIB := 32
-
-LOCAL_SRC_FILES := \
- com_svox_picottsengine.cpp \
- svox_ssml_parser.cpp
-
-LOCAL_CFLAGS := $(svox_tts_warn_flags)
-
-LOCAL_C_INCLUDES += \
- external/svox/pico/lib \
- external/svox/pico/compat/include
-
-LOCAL_STATIC_LIBRARIES := libsvoxpico
-LOCAL_SHARED_LIBRARIES := libcutils libexpat libutils liblog
-
-include $(BUILD_SHARED_LIBRARY)
-
-svox_tts_warn_flags :=
diff --git a/picolanginstaller/Android.mk b/picolanginstaller/Android.mk
deleted file mode 100644
index a1c529f..0000000
--- a/picolanginstaller/Android.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-
-LOCAL_PACKAGE_NAME := PicoLangInstaller
-
-include $(BUILD_PACKAGE)
