Housekeeping

- Split out libdeepspeech into _android and _jre, for the respective versions
- Moved settings.gradle to both versions, and modified them appropriately
- Removed .so files, which were accidentally included in the previous commit, same goes for Makefile.original
- Updated .gitignore's to work with the new structure
- libdeepspeech_android is exactly as it is currently in mozilla:master
- Updated Makefile to work with the new structure

native_client/java/.gitignore

@@ -1,26 +1,22 @@
 #Native libs
-libdeepspeech/libs/*
-libdeepspeech/*.so
+libdeepspeech_android/libs/*
+!libdeepspeech_android/libs/.gitignore
+libdeepspeech_android/*.so
 
 #Gradle
 .gradle/
-libdeepspeech/build/
 
 #Make/CMake
 Makefile/
-libdeepspeech/CMakeFiles/
-libdeepspeech/cmake_install.cmake
-libdeepspeech/CMakeCache.txt
-libdeepspeech/Makefile
 
 #SWIG
 jni/*.cpp
 jni/*.o
 
-#Setup.sh output
+#Collected files by make
 build/
 
 #Autogenerated java files by SWIG
-libdeepspeech/src/main/java/org/deepspeech/libdeepspeech/*.java
-!libdeepspeech/src/main/java/org/deepspeech/libdeepspeech/DeepSpeechModel.java
-!libdeepspeech/src/main/java/org/deepspeech/libdeepspeech/DeepSpeechStreamingState.java=
+libdeepspeech_android/src/main/java/org/deepspeech/libdeepspeech/*.java
+!libdeepspeech_android/src/main/java/org/deepspeech/libdeepspeech/DeepSpeechModel.java
+!libdeepspeech_android/src/main/java/org/deepspeech/libdeepspeech/DeepSpeechStreamingState.java

native_client/java/Makefile

@@ -13,6 +13,14 @@ clean: android-clean jre-clean
 
 android-clean:
 	$(GRADLE) clean
+	rm -rf settings.gradle
+
+jre-clean:
+	rm -f build.gradle
+	rm -f jni/deepspeech_wrap.cpp jni/deepspeech_wrap.o
+	rm -rf libdeepspeech_jre/cmake_install.cmake libdeepspeech_jre/CMakeCache.txt libdeepspeech_jre/Makefile libdeepspeech_jre/CMakeFiles/
+	rm -rf libdeepspeech_jre/build/
+	rm -rf settings.gradle
 
 libdeepspeech_jre/libs/%/libdeepspeech.so:
 	-mkdir libdeepspeech_jre/libs/$*/
@@ -24,6 +32,7 @@ libdeepspeech_android/libs/%/libdeepspeech.so:
 
 android-prepare:
 	cp build.gradle.android build.gradle
+	cp libdeepspeech_android/settings.gradle settings.gradle
 
 android: android-prepare android-clean bindings $(patsubst %,libdeepspeech/libs/%/libdeepspeech.so,$(ARCHS))
 	$(GRADLE) build
@@ -32,6 +41,7 @@ jre: jre-prepare jre-collect jre-restore-makefile jre-clean
 jre-prepare: $(patsubst %,libdeepspeech_jre/libs/%/libdeepspeech.so,$(ARCHS))
 	cp Makefile Makefile.original
 	cp build.gradle.standalone build.gradle
+	cp libdeepspeech_jre/settings.gradle ./settings.gradle
 	sed -i 's|__JAVA_HOME__|'${JAVA_HOME}'|g' libdeepspeech_jre/CMakeLists.txt
 
 jre-libdeepspeech-jni: bindings
@@ -46,13 +56,7 @@ jre-collect: jre-gradle
 	mkdir -p build
 	mv libdeepspeech_jre/libdeepspeech-jni.so build/
 	cp libdeepspeech_jre/libs/x86_64/libdeepspeech.so build/
-	cp libdeepspeech_jre/build/libs/libdeepspeech.jar build/
-
-jre-clean:
-	rm -f build.gradle
-	rm -f jni/deepspeech_wrap.cpp jni/deepspeech_wrap.o
-	rm -rf libdeepspeech_jre/cmake_install.cmake libdeepspeech_jre/CMakeCache.txt libdeepspeech_jre/Makefile libdeepspeech_jre/CMakeFiles/
-	rm -rf libdeepspeech_jre/build/
+	cp libdeepspeech_jre/build/libs/libdeepspeech_jre.jar build/
 
 jre-restore-makefile:
 	mv Makefile.original Makefile
@@ -61,7 +65,7 @@ maven-bundle: android
 	$(GRADLE) uploadArchives
 	$(GRADLE) zipMavenArtifacts
 
-bindings: clean ds-swig
+bindings: ds-swig
 	mkdir -p ./tmp
 	$(DS_SWIG_ENV) swig -c++ -java -package org.deepspeech.libdeepspeech -outdir ./tmp -o jni/deepspeech_wrap.cpp jni/deepspeech.i
 	cp ./tmp/* libdeepspeech_android/src/main/java/org/deepspeech/libdeepspeech/

native_client/java/libdeepspeech_android/settings.gradle

@@ -0,0 +1 @@
+include ':libdeepspeech_android'

native_client/java/libdeepspeech_jre/.gitignore

@@ -0,0 +1,13 @@
+src/main/java/org/deepspeech/libdeepspeech/*.java
+!src/main/java/org/deepspeech/libdeepspeech/DeepSpeechModel.java
+!src/main/java/org/deepspeech/libdeepspeech/DeepSpeechStreamingState.java
+
+CMakeFiles/
+cmake_install.cmake
+CMakeCache.txt
+Makefile
+
+build/
+
+libs/*
+*.so

native_client/java/libdeepspeech_jre/settings.gradle

@@ -0,0 +1 @@
+include ':libdeepspeech_jre'