Move the android sources to android/... to avoid polluting the APK when it is being built through eclipse

Makefile.am

@@ -125,14 +125,14 @@ espeak-data/phontab: src/espeakedit espeak-data/dir.stamp espeak-data/dictsource
 
 ##### android language data packs:
 
-res/raw/espeakdata.zip: espeak-data/dir.stamp espeak-data/phontab dictionaries
+android/res/raw/espeakdata.zip: espeak-data/dir.stamp espeak-data/phontab dictionaries
 	rm -f $@
 	zip -r $@ \
 		espeak-data/intonations \
 		espeak-data/phondata espeak-data/phonindex espeak-data/phontab \
 		espeak-data/*_dict espeak-data/voices
 
-android: res/raw/espeakdata.zip
+android: android/res/raw/espeakdata.zip
 
 ##### dictionaries:
 

README.md

@@ -18,13 +18,14 @@ configured correctly:
 
 1.  Build the `libttsespeak.so` file by running:
 
+        $ cd android
         $ ndk-build
 2.  Open Eclipse.
 3.  Create a new workspace.
 4.  Import the espeak folder as an exising Android project.
 5.  Build the espeak apk within Eclipse.
 
-In order to build the `espeak-data.zip` and `espeak-data-en_only.zip` data files, you need to run the following commands:
+In order to build the `espeakdata.zip` file in `android/res/raw`, you need to run the following commands:
 
 	$ ./autogen.sh
 	$ ./configure --prefix=/usr
@@ -35,8 +36,10 @@ In order to build the `espeak-data.zip` and `espeak-data-en_only.zip` data files
 The generated `eSpeakActivity.apk` can be installed like any other apk build
 via eclipse, such as by using the `Run` menu option.
 
-After running, `eSpeakActivity` will download the `espeak-data.zip` file. To
-enable eSpeak, you need to:
+After running, `eSpeakActivity` will extract the `espeakdata.zip` file into its
+own data directory to set up the available voices.
+
+To enable eSpeak, you need to:
 
 1.  go into the Android `Text-to-Speech settings` UI;
 2.  enable `eSpeak TTS` in the `Engines` section;

jni/Android.mk → android/jni/Android.mk

@@ -20,7 +20,7 @@ BLACKLIST_SRC_FILES := \
   %/voicedlg.cpp \
   %/vowelchart.cpp
 
-ESPEAK_SRC_PATH := ../src
+ESPEAK_SRC_PATH := ../../src
 
 ESPEAK_SRC_FILES := \
   $(subst $(LOCAL_PATH)/$(ESPEAK_SRC_PATH),$(ESPEAK_SRC_PATH),$(wildcard $(LOCAL_PATH)/$(ESPEAK_SRC_PATH)/*.c*))