From 23a742a7e065a583c4c1dbcd1fd997696407ac84 Mon Sep 17 00:00:00 2001
From: Alexandre Lissy <lissyx@lissyx.dyndns.org>
Date: Wed, 20 Jan 2021 15:39:58 +0100
Subject: [PATCH] WIP: Introduce libdeepspeech_android / libdeepspeech_jre

---
 native_client/java/app/build.gradle                             | 2 +-
 .../{libdeepspeech => libdeepspeech_android}/CMakeLists.txt     | 0
 .../java/{libdeepspeech => libdeepspeech_android}/build.gradle  | 2 +-
 .../{libdeepspeech => libdeepspeech_android}/gradle.properties  | 0
 .../{libdeepspeech => libdeepspeech_android}/libs/.gitignore    | 0
 .../{libdeepspeech => libdeepspeech_android}/proguard-rules.pro | 0
 .../src/main/AndroidManifest.xml                                | 0
 native_client/java/settings.gradle                              | 2 +-
 8 files changed, 3 insertions(+), 3 deletions(-)
 rename native_client/java/{libdeepspeech => libdeepspeech_android}/CMakeLists.txt (100%)
 rename native_client/java/{libdeepspeech => libdeepspeech_android}/build.gradle (97%)
 rename native_client/java/{libdeepspeech => libdeepspeech_android}/gradle.properties (100%)
 rename native_client/java/{libdeepspeech => libdeepspeech_android}/libs/.gitignore (100%)
 rename native_client/java/{libdeepspeech => libdeepspeech_android}/proguard-rules.pro (100%)
 rename native_client/java/{libdeepspeech => libdeepspeech_android}/src/main/AndroidManifest.xml (100%)

diff --git a/native_client/java/app/build.gradle b/native_client/java/app/build.gradle
index 3b5b124aa6..5937314c5d 100644
--- a/native_client/java/app/build.gradle
+++ b/native_client/java/app/build.gradle
@@ -28,7 +28,7 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation project(':libdeepspeech')
+    implementation project(':libdeepspeech_android')
     implementation 'com.android.support:appcompat-v7:27.1.1'
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
     testImplementation 'junit:junit:4.12'
diff --git a/native_client/java/libdeepspeech/CMakeLists.txt b/native_client/java/libdeepspeech_android/CMakeLists.txt
similarity index 100%
rename from native_client/java/libdeepspeech/CMakeLists.txt
rename to native_client/java/libdeepspeech_android/CMakeLists.txt
diff --git a/native_client/java/libdeepspeech/build.gradle b/native_client/java/libdeepspeech_android/build.gradle
similarity index 97%
rename from native_client/java/libdeepspeech/build.gradle
rename to native_client/java/libdeepspeech_android/build.gradle
index 40177a9f6e..98d6db0414 100644
--- a/native_client/java/libdeepspeech/build.gradle
+++ b/native_client/java/libdeepspeech_android/build.gradle
@@ -46,7 +46,7 @@ android {
 
     // Avoid scanning libdeepspeech_doc
     sourceSets {
-        main.java.srcDirs = [ 'src/main/java/org/deepspeech/libdeepspeech/' ]
+        main.java.srcDirs = [ '../src/main/java/org/deepspeech/libdeepspeech/' ]
     }
 }
 
diff --git a/native_client/java/libdeepspeech/gradle.properties b/native_client/java/libdeepspeech_android/gradle.properties
similarity index 100%
rename from native_client/java/libdeepspeech/gradle.properties
rename to native_client/java/libdeepspeech_android/gradle.properties
diff --git a/native_client/java/libdeepspeech/libs/.gitignore b/native_client/java/libdeepspeech_android/libs/.gitignore
similarity index 100%
rename from native_client/java/libdeepspeech/libs/.gitignore
rename to native_client/java/libdeepspeech_android/libs/.gitignore
diff --git a/native_client/java/libdeepspeech/proguard-rules.pro b/native_client/java/libdeepspeech_android/proguard-rules.pro
similarity index 100%
rename from native_client/java/libdeepspeech/proguard-rules.pro
rename to native_client/java/libdeepspeech_android/proguard-rules.pro
diff --git a/native_client/java/libdeepspeech/src/main/AndroidManifest.xml b/native_client/java/libdeepspeech_android/src/main/AndroidManifest.xml
similarity index 100%
rename from native_client/java/libdeepspeech/src/main/AndroidManifest.xml
rename to native_client/java/libdeepspeech_android/src/main/AndroidManifest.xml
diff --git a/native_client/java/settings.gradle b/native_client/java/settings.gradle
index a31d5636a1..5aaeaf9231 100644
--- a/native_client/java/settings.gradle
+++ b/native_client/java/settings.gradle
@@ -1 +1 @@
-include ':app', ':libdeepspeech'
+include ':app', ':libdeepspeech_android', ':libdeepspeech_jre'