Moving PicoTts plugin under the pico directory of external/svox

71 files changed, 93 insertions, 94 deletions

diff --git a/Android.mk b/Android.mk
index 4232ad0..6571161 100755
--- a/Android.mk
+++ b/Android.mk
@@ -1,94 +1 @@
-#include $(all-subdir-makefiles)
-
-# SVOX Pico TTS Engine
-# This makefile builds both an activity and a shared library.
-
-ifneq ($(TARGET_SIMULATOR),true) # not 64 bit clean
-
-TOP_LOCAL_PATH:= $(call my-dir)
-
-# Build Pico activity
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := user
-
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-
-LOCAL_PACKAGE_NAME := PicoTts
-
-LOCAL_JNI_SHARED_LIBRARIES := libttspico
-
-include $(BUILD_PACKAGE)
-
-# Build Pico Shared Library
-
-LOCAL_PATH:= $(TOP_LOCAL_PATH)/tts
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES:= com_svox_picottsengine.cpp
-
-LOCAL_C_INCLUDES += \
-	external/svox/lib \
-	frameworks
-
-LOCAL_STATIC_LIBRARIES:= libsvoxpico
-
-LOCAL_SHARED_LIBRARIES:= libcutils
-
-LOCAL_MODULE:= libttspico
-
-LOCAL_ARM_MODE:= arm
-
-LOCAL_PRELINK_MODULE:= false
-
-include $(BUILD_SHARED_LIBRARY)
-
-
-# Build Base Generic SVOX Pico Library
-LOCAL_PATH:= $(TOP_LOCAL_PATH)/lib
-include $(CLEAR_VARS)
-
-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_PRELINK_MODULE:= false
-
-LOCAL_MODULE:= libsvoxpico
-
-LOCAL_CFLAGS+= $(TOOL_CFLAGS)
-
-LOCAL_LDFLAGS+= $(TOOL_LDFLAGS)
-
-include $(BUILD_STATIC_LIBRARY)
-
-endif # TARGET_SIMULATOR
+include $(all-subdir-makefiles)
diff --git a/pico/Android.mk b/pico/Android.mk
new file mode 100755
index 0000000..485ca70
--- /dev/null
+++ b/pico/Android.mk
@@ -0,0 +1,92 @@
+# SVOX Pico TTS Engine
+# This makefile builds both an activity and a shared library.
+
+ifneq ($(TARGET_SIMULATOR),true) # not 64 bit clean
+
+TOP_LOCAL_PATH:= $(call my-dir)
+
+# Build Pico activity
+
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := user
+
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
+
+LOCAL_PACKAGE_NAME := PicoTts
+
+LOCAL_JNI_SHARED_LIBRARIES := libttspico
+
+include $(BUILD_PACKAGE)
+
+# Build Pico Shared Library
+
+LOCAL_PATH:= $(TOP_LOCAL_PATH)/tts
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES:= com_svox_picottsengine.cpp
+
+LOCAL_C_INCLUDES += \
+	external/svox/pico/lib \
+	frameworks
+
+LOCAL_STATIC_LIBRARIES:= libsvoxpico
+
+LOCAL_SHARED_LIBRARIES:= libcutils
+
+LOCAL_MODULE:= libttspico
+
+LOCAL_ARM_MODE:= arm
+
+LOCAL_PRELINK_MODULE:= false
+
+include $(BUILD_SHARED_LIBRARY)
+
+
+# Build Base Generic SVOX Pico Library
+LOCAL_PATH:= $(TOP_LOCAL_PATH)/lib
+include $(CLEAR_VARS)
+
+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_PRELINK_MODULE:= false
+
+LOCAL_MODULE:= libsvoxpico
+
+LOCAL_CFLAGS+= $(TOOL_CFLAGS)
+
+LOCAL_LDFLAGS+= $(TOOL_LDFLAGS)
+
+include $(BUILD_STATIC_LIBRARY)
+
+endif # TARGET_SIMULATOR
diff --git a/AndroidManifest.xml b/pico/AndroidManifest.xml
index 7188e70..7188e70 100755
--- a/AndroidManifest.xml
+++ b/pico/AndroidManifest.xml
diff --git a/lib/picoacph.c b/pico/lib/picoacph.c
index 98feb6e..98feb6e 100644
--- a/lib/picoacph.c
+++ b/pico/lib/picoacph.c
diff --git a/lib/picoacph.h b/pico/lib/picoacph.h
index 266ab6e..266ab6e 100644
--- a/lib/picoacph.h
+++ b/pico/lib/picoacph.h
diff --git a/lib/picoapi.c b/pico/lib/picoapi.c
index c4ef8bf..c4ef8bf 100644
--- a/lib/picoapi.c
+++ b/pico/lib/picoapi.c
diff --git a/lib/picoapi.h b/pico/lib/picoapi.h
index 0dad702..0dad702 100644
--- a/lib/picoapi.h
+++ b/pico/lib/picoapi.h
diff --git a/lib/picoapid.h b/pico/lib/picoapid.h
index ef62701..ef62701 100644
--- a/lib/picoapid.h
+++ b/pico/lib/picoapid.h
diff --git a/lib/picobase.c b/pico/lib/picobase.c
index 9246551..9246551 100644
--- a/lib/picobase.c
+++ b/pico/lib/picobase.c
diff --git a/lib/picobase.h b/pico/lib/picobase.h
index 1c384e1..1c384e1 100644
--- a/lib/picobase.h
+++ b/pico/lib/picobase.h
diff --git a/lib/picocep.c b/pico/lib/picocep.c
index 2510c13..2510c13 100644
--- a/lib/picocep.c
+++ b/pico/lib/picocep.c
diff --git a/lib/picocep.h b/pico/lib/picocep.h
index 79a5d7c..79a5d7c 100644
--- a/lib/picocep.h
+++ b/pico/lib/picocep.h
diff --git a/lib/picoctrl.c b/pico/lib/picoctrl.c
index 5af70e3..5af70e3 100644
--- a/lib/picoctrl.c
+++ b/pico/lib/picoctrl.c
diff --git a/lib/picoctrl.h b/pico/lib/picoctrl.h
index 1dfea54..1dfea54 100644
--- a/lib/picoctrl.h
+++ b/pico/lib/picoctrl.h
diff --git a/lib/picodata.c b/pico/lib/picodata.c
index 244e4b6..244e4b6 100644
--- a/lib/picodata.c
+++ b/pico/lib/picodata.c
diff --git a/lib/picodata.h b/pico/lib/picodata.h
index 637a3ff..637a3ff 100644
--- a/lib/picodata.h
+++ b/pico/lib/picodata.h
diff --git a/lib/picodbg.c b/pico/lib/picodbg.c
index 8fa753b..8fa753b 100644
--- a/lib/picodbg.c
+++ b/pico/lib/picodbg.c
diff --git a/lib/picodbg.h b/pico/lib/picodbg.h
index 490d3b5..490d3b5 100644
--- a/lib/picodbg.h
+++ b/pico/lib/picodbg.h
diff --git a/lib/picodefs.h b/pico/lib/picodefs.h
index 6613e84..6613e84 100644
--- a/lib/picodefs.h
+++ b/pico/lib/picodefs.h
diff --git a/lib/picodsp.h b/pico/lib/picodsp.h
index 67457f8..67457f8 100644
--- a/lib/picodsp.h
+++ b/pico/lib/picodsp.h
diff --git a/lib/picoextapi.c b/pico/lib/picoextapi.c
index 4c5d30c..4c5d30c 100644
--- a/lib/picoextapi.c
+++ b/pico/lib/picoextapi.c
diff --git a/lib/picoextapi.h b/pico/lib/picoextapi.h
index 1768394..1768394 100644
--- a/lib/picoextapi.h
+++ b/pico/lib/picoextapi.h
diff --git a/lib/picofftsg.c b/pico/lib/picofftsg.c
index dcca018..dcca018 100644
--- a/lib/picofftsg.c
+++ b/pico/lib/picofftsg.c
diff --git a/lib/picofftsg.h b/pico/lib/picofftsg.h
index d9c6a1a..d9c6a1a 100644
--- a/lib/picofftsg.h
+++ b/pico/lib/picofftsg.h
diff --git a/lib/picokdbg.c b/pico/lib/picokdbg.c
index c0336ba..c0336ba 100644
--- a/lib/picokdbg.c
+++ b/pico/lib/picokdbg.c
diff --git a/lib/picokdbg.h b/pico/lib/picokdbg.h
index c17942f..c17942f 100644
--- a/lib/picokdbg.h
+++ b/pico/lib/picokdbg.h
diff --git a/lib/picokdt.c b/pico/lib/picokdt.c
index 54e36ac..54e36ac 100644
--- a/lib/picokdt.c
+++ b/pico/lib/picokdt.c
diff --git a/lib/picokdt.h b/pico/lib/picokdt.h
index 3ef973c..3ef973c 100644
--- a/lib/picokdt.h
+++ b/pico/lib/picokdt.h
diff --git a/lib/picokfst.c b/pico/lib/picokfst.c
index 560709c..560709c 100644
--- a/lib/picokfst.c
+++ b/pico/lib/picokfst.c
diff --git a/lib/picokfst.h b/pico/lib/picokfst.h
index b391013..b391013 100644
--- a/lib/picokfst.h
+++ b/pico/lib/picokfst.h
diff --git a/lib/picoklex.c b/pico/lib/picoklex.c
index 7ff0a33..7ff0a33 100644
--- a/lib/picoklex.c
+++ b/pico/lib/picoklex.c
diff --git a/lib/picoklex.h b/pico/lib/picoklex.h
index e186393..e186393 100644
--- a/lib/picoklex.h
+++ b/pico/lib/picoklex.h
diff --git a/lib/picoknow.c b/pico/lib/picoknow.c
index 70b471c..70b471c 100644
--- a/lib/picoknow.c
+++ b/pico/lib/picoknow.c
diff --git a/lib/picoknow.h b/pico/lib/picoknow.h
index 1444856..1444856 100644
--- a/lib/picoknow.h
+++ b/pico/lib/picoknow.h
diff --git a/lib/picokpdf.c b/pico/lib/picokpdf.c
index bbdbec4..bbdbec4 100644
--- a/lib/picokpdf.c
+++ b/pico/lib/picokpdf.c
diff --git a/lib/picokpdf.h b/pico/lib/picokpdf.h
index f4508a1..f4508a1 100644
--- a/lib/picokpdf.h
+++ b/pico/lib/picokpdf.h
diff --git a/lib/picokpr.c b/pico/lib/picokpr.c
index 956ae39..956ae39 100644
--- a/lib/picokpr.c
+++ b/pico/lib/picokpr.c
diff --git a/lib/picokpr.h b/pico/lib/picokpr.h
index 0532b49..0532b49 100644
--- a/lib/picokpr.h
+++ b/pico/lib/picokpr.h
diff --git a/lib/picoktab.c b/pico/lib/picoktab.c
index ca8b470..ca8b470 100644
--- a/lib/picoktab.c
+++ b/pico/lib/picoktab.c
diff --git a/lib/picoktab.h b/pico/lib/picoktab.h
index 71ba2ab..71ba2ab 100644
--- a/lib/picoktab.h
+++ b/pico/lib/picoktab.h
diff --git a/lib/picoos.c b/pico/lib/picoos.c
index 4e2b439..4e2b439 100644
--- a/lib/picoos.c
+++ b/pico/lib/picoos.c
diff --git a/lib/picoos.h b/pico/lib/picoos.h
index 859e176..859e176 100644
--- a/lib/picoos.h
+++ b/pico/lib/picoos.h
diff --git a/lib/picopal.c b/pico/lib/picopal.c
index db05e2b..db05e2b 100644
--- a/lib/picopal.c
+++ b/pico/lib/picopal.c
diff --git a/lib/picopal.h b/pico/lib/picopal.h
index acfc8e0..acfc8e0 100644
--- a/lib/picopal.h
+++ b/pico/lib/picopal.h
diff --git a/lib/picopam.c b/pico/lib/picopam.c
index 02e5cc2..02e5cc2 100644
--- a/lib/picopam.c
+++ b/pico/lib/picopam.c
diff --git a/lib/picopam.h b/pico/lib/picopam.h
index 18f7730..18f7730 100644
--- a/lib/picopam.h
+++ b/pico/lib/picopam.h
diff --git a/lib/picopltf.h b/pico/lib/picopltf.h
index 0cf2659..0cf2659 100644
--- a/lib/picopltf.h
+++ b/pico/lib/picopltf.h
diff --git a/lib/picopr.c b/pico/lib/picopr.c
index f54734a..f54734a 100644
--- a/lib/picopr.c
+++ b/pico/lib/picopr.c
diff --git a/lib/picopr.h b/pico/lib/picopr.h
index 3ade5c9..3ade5c9 100644
--- a/lib/picopr.h
+++ b/pico/lib/picopr.h
diff --git a/lib/picorsrc.c b/pico/lib/picorsrc.c
index d6e1e51..d6e1e51 100644
--- a/lib/picorsrc.c
+++ b/pico/lib/picorsrc.c
diff --git a/lib/picorsrc.h b/pico/lib/picorsrc.h
index 4dfb19e..4dfb19e 100644
--- a/lib/picorsrc.h
+++ b/pico/lib/picorsrc.h
diff --git a/lib/picosa.c b/pico/lib/picosa.c
index 3147c76..3147c76 100644
--- a/lib/picosa.c
+++ b/pico/lib/picosa.c
diff --git a/lib/picosa.h b/pico/lib/picosa.h
index c35da2e..c35da2e 100644
--- a/lib/picosa.h
+++ b/pico/lib/picosa.h
diff --git a/lib/picosig.c b/pico/lib/picosig.c
index be44b3c..be44b3c 100644
--- a/lib/picosig.c
+++ b/pico/lib/picosig.c
diff --git a/lib/picosig.h b/pico/lib/picosig.h
index 3e29e8f..3e29e8f 100644
--- a/lib/picosig.h
+++ b/pico/lib/picosig.h
diff --git a/lib/picosig2.c b/pico/lib/picosig2.c
index e431c90..e431c90 100644
--- a/lib/picosig2.c
+++ b/pico/lib/picosig2.c
diff --git a/lib/picosig2.h b/pico/lib/picosig2.h
index f239ced..f239ced 100644
--- a/lib/picosig2.h
+++ b/pico/lib/picosig2.h
diff --git a/lib/picospho.c b/pico/lib/picospho.c
index 0d0cdf8..0d0cdf8 100644
--- a/lib/picospho.c
+++ b/pico/lib/picospho.c
diff --git a/lib/picospho.h b/pico/lib/picospho.h
index 0c4a0d8..0c4a0d8 100644
--- a/lib/picospho.h
+++ b/pico/lib/picospho.h
diff --git a/lib/picotok.c b/pico/lib/picotok.c
index 4488609..4488609 100644
--- a/lib/picotok.c
+++ b/pico/lib/picotok.c
diff --git a/lib/picotok.h b/pico/lib/picotok.h
index b602408..b602408 100644
--- a/lib/picotok.h
+++ b/pico/lib/picotok.h
diff --git a/lib/picotrns.c b/pico/lib/picotrns.c
index 2d16340..2d16340 100644
--- a/lib/picotrns.c
+++ b/pico/lib/picotrns.c
diff --git a/lib/picotrns.h b/pico/lib/picotrns.h
index f535ce0..f535ce0 100644
--- a/lib/picotrns.h
+++ b/pico/lib/picotrns.h
diff --git a/lib/picowa.c b/pico/lib/picowa.c
index 3e793c9..3e793c9 100644
--- a/lib/picowa.c
+++ b/pico/lib/picowa.c
diff --git a/lib/picowa.h b/pico/lib/picowa.h
index d7fbcd3..d7fbcd3 100644
--- a/lib/picowa.h
+++ b/pico/lib/picowa.h
diff --git a/res/layout/main.xml b/pico/res/layout/main.xml
index 7a7828e..7a7828e 100755
--- a/res/layout/main.xml
+++ b/pico/res/layout/main.xml
diff --git a/res/values/strings.xml b/pico/res/values/strings.xml
index 527b049..527b049 100755
--- a/res/values/strings.xml
+++ b/pico/res/values/strings.xml
diff --git a/src/com/svox/pico/CheckVoiceData.java b/pico/src/com/svox/pico/CheckVoiceData.java
index 66e6833..66e6833 100755
--- a/src/com/svox/pico/CheckVoiceData.java
+++ b/pico/src/com/svox/pico/CheckVoiceData.java
diff --git a/src/com/svox/pico/DownloadVoiceData.java b/pico/src/com/svox/pico/DownloadVoiceData.java
index 02638bb..02638bb 100755
--- a/src/com/svox/pico/DownloadVoiceData.java
+++ b/pico/src/com/svox/pico/DownloadVoiceData.java
diff --git a/src/com/svox/pico/Pico.java b/pico/src/com/svox/pico/Pico.java
index b8ab7d1..b8ab7d1 100755
--- a/src/com/svox/pico/Pico.java
+++ b/pico/src/com/svox/pico/Pico.java
diff --git a/tts/com_svox_picottsengine.cpp b/pico/tts/com_svox_picottsengine.cpp
index 3e29695..3e29695 100644
--- a/tts/com_svox_picottsengine.cpp
+++ b/pico/tts/com_svox_picottsengine.cpp