diff --git a/App_Resources/Android/app.gradle b/App_Resources/Android/app.gradle index abda62fd..5c47d87c 100644 --- a/App_Resources/Android/app.gradle +++ b/App_Resources/Android/app.gradle @@ -1,8 +1,132 @@ +import org.apache.tools.ant.taskdefs.condition.Os + // You can add your native dependencies here dependencies { // implementation 'androidx.multidex:multidex:2.0.1' } +def faceclawSherpaOnnxVersion = "1.12.34" +def faceclawLibLc3Version = "1.1.3" +def faceclawAbi = "arm64-v8a" +def faceclawJniLibsDir = file("$projectDir/src/main/jniLibs/$faceclawAbi") +def faceclawNativeBuildDir = file("$buildDir/faceclaw-native") + +def faceclawDownload = { String url, File destination -> + if (destination.exists() && destination.length() > 0) { + return + } + destination.parentFile.mkdirs() + println "Downloading $url" + destination.withOutputStream { output -> + new URL(url).withInputStream { input -> + output << input + } + } +} + +def faceclawNdkHostTag = { + if (Os.isFamily(Os.FAMILY_MAC)) return "darwin-x86_64" + if (Os.isFamily(Os.FAMILY_WINDOWS)) return "windows-x86_64" + return "linux-x86_64" +} + +def faceclawFindNdkRoot = { + def explicitNdk = System.getenv("ANDROID_NDK_HOME") + if (explicitNdk != null && file(explicitNdk).exists()) { + return file(explicitNdk) + } + def sdkRoot = System.getenv("ANDROID_HOME") ?: System.getenv("ANDROID_SDK_ROOT") + if (sdkRoot != null) { + def ndkDir = file("$sdkRoot/ndk") + if (ndkDir.exists()) { + def installed = ndkDir.listFiles()?.findAll { it.isDirectory() }?.sort { a, b -> b.name <=> a.name } + if (installed && !installed.isEmpty()) { + return installed[0] + } + } + } + try { + return android.ndkDirectory + } catch (Throwable ignored) { + return null + } +} + +tasks.register("prepareFaceclawNativeLibs") { + outputs.files( + file("$faceclawJniLibsDir/libonnxruntime.so"), + file("$faceclawJniLibsDir/libsherpa-onnx-jni.so"), + file("$faceclawJniLibsDir/libfaceclaw_lc3.so") + ) + + doLast { + faceclawJniLibsDir.mkdirs() + + def downloadsDir = file("$faceclawNativeBuildDir/downloads") + def sherpaArchive = file("$downloadsDir/sherpa-onnx-v${faceclawSherpaOnnxVersion}-android.tar.bz2") + faceclawDownload( + "https://github.com/k2-fsa/sherpa-onnx/releases/download/v${faceclawSherpaOnnxVersion}/sherpa-onnx-v${faceclawSherpaOnnxVersion}-android.tar.bz2", + sherpaArchive + ) + copy { + from tarTree(resources.bzip2(sherpaArchive)) + include "**/jniLibs/$faceclawAbi/libonnxruntime.so" + include "**/jniLibs/$faceclawAbi/libsherpa-onnx-jni.so" + eachFile { details -> details.path = details.name } + includeEmptyDirs = false + into faceclawJniLibsDir + } + + def lc3Archive = file("$downloadsDir/liblc3-v${faceclawLibLc3Version}.tar.gz") + faceclawDownload( + "https://github.com/google/liblc3/archive/refs/tags/v${faceclawLibLc3Version}.tar.gz", + lc3Archive + ) + def lc3ExtractDir = file("$faceclawNativeBuildDir/liblc3") + if (!file("$lc3ExtractDir/liblc3-${faceclawLibLc3Version}/src/lc3.c").exists()) { + delete lc3ExtractDir + copy { + from tarTree(resources.gzip(lc3Archive)) + into lc3ExtractDir + } + } + + def ndkRoot = faceclawFindNdkRoot() + if (ndkRoot == null || !ndkRoot.exists()) { + throw new GradleException("Android NDK is required to build libfaceclaw_lc3.so") + } + def clang = file("$ndkRoot/toolchains/llvm/prebuilt/${faceclawNdkHostTag()}/bin/aarch64-linux-android24-clang") + if (!clang.exists()) { + throw new GradleException("Could not find Android clang at $clang") + } + + def lc3Root = file("$lc3ExtractDir/liblc3-${faceclawLibLc3Version}") + def lc3Sources = [ + "attdet.c", "bits.c", "bwdet.c", "energy.c", "lc3.c", "ltpf.c", + "mdct.c", "plc.c", "sns.c", "spec.c", "tables.c", "tns.c" + ].collect { file("$lc3Root/src/$it").absolutePath } + + exec { + commandLine([ + clang.absolutePath, + "-shared", + "-fPIC", + "-O3", + "-DLC3_PLUS=0", + "-DLC3_PLUS_HR=0", + "-I${file("$lc3Root/include").absolutePath}", + file("$projectDir/src/main/native/faceclaw_lc3_decoder.c").absolutePath + ] + lc3Sources + [ + "-lm", + "-Wl,-z,max-page-size=16384", + "-Wl,-z,common-page-size=16384", + "-o", + file("$faceclawJniLibsDir/libfaceclaw_lc3.so").absolutePath + ]) + } + } +} + android { compileSdkVersion 35 buildToolsVersion "35" @@ -30,3 +154,7 @@ android { additionalParameters "--no-version-vectors" } } + +tasks.matching { it.name == "preBuild" }.configureEach { + dependsOn tasks.named("prepareFaceclawNativeLibs") +} diff --git a/App_Resources/Android/src/main/java/com/faceclaw/app/FaceclawBleManager.java b/App_Resources/Android/src/main/java/com/faceclaw/app/FaceclawBleManager.java index 63b67ca0..6240e3b1 100644 --- a/App_Resources/Android/src/main/java/com/faceclaw/app/FaceclawBleManager.java +++ b/App_Resources/Android/src/main/java/com/faceclaw/app/FaceclawBleManager.java @@ -459,7 +459,6 @@ public class FaceclawBleManager { @Override public void onCharacteristicChanged(BluetoothGatt gatt, BluetoothGattCharacteristic characteristic, byte[] value) { - Log.i(TAG, "onCharacteristicChanged"); dispatchNotification(gatt.getDevice().getAddress(), characteristic.getUuid().toString(), value); } @@ -479,7 +478,6 @@ public class FaceclawBleManager { } private void dispatchNotification(String address, String characteristicUuid, byte[] data) { - Log.i(TAG, "dispatchNotification"); FaceclawBleListener current = listener; if (current == null) { return; diff --git a/App_Resources/Android/src/main/jniLibs/arm64-v8a/libfaceclaw_lc3.so b/App_Resources/Android/src/main/jniLibs/arm64-v8a/libfaceclaw_lc3.so deleted file mode 100755 index b9eee4f3..00000000 Binary files a/App_Resources/Android/src/main/jniLibs/arm64-v8a/libfaceclaw_lc3.so and /dev/null differ diff --git a/App_Resources/Android/src/main/jniLibs/arm64-v8a/libonnxruntime.so b/App_Resources/Android/src/main/jniLibs/arm64-v8a/libonnxruntime.so deleted file mode 100644 index 873e54e2..00000000 Binary files a/App_Resources/Android/src/main/jniLibs/arm64-v8a/libonnxruntime.so and /dev/null differ diff --git a/App_Resources/Android/src/main/jniLibs/arm64-v8a/libsherpa-onnx-jni.so b/App_Resources/Android/src/main/jniLibs/arm64-v8a/libsherpa-onnx-jni.so deleted file mode 100644 index 754aa66d..00000000 Binary files a/App_Resources/Android/src/main/jniLibs/arm64-v8a/libsherpa-onnx-jni.so and /dev/null differ diff --git a/package-lock.json b/package-lock.json index 62a1f5ec..8eb98082 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,7 @@ "upng-js": "^2.1.0" }, "devDependencies": { - "@nativescript/android": "9.0.2", + "@nativescript/android": "9.0.4", "@nativescript/types": "~9.0.0", "@nativescript/webpack": "~5.0.25", "typescript": "~5.4.0" @@ -465,9 +465,9 @@ } }, "node_modules/@nativescript/android": { - "version": "9.0.2", - "resolved": "https://registry.npmjs.org/@nativescript/android/-/android-9.0.2.tgz", - "integrity": "sha512-kkliGNCZhbs5SM/EFA7KQaNLJLGFFJF/y6lAWr2hsfNv7n5DU5+5+pNIJ/+u4zyYoKijR2Iq3q/1QKBXthCGoQ==", + "version": "9.0.4", + "resolved": "https://registry.npmjs.org/@nativescript/android/-/android-9.0.4.tgz", + "integrity": "sha512-htfv7Ku/M6Tq6fQjhV0nSwxa9agNYEs9x4zBdOW8mRye5CZS7xTJq83MffYkItrtN/jJeeaxiSAgu0F+L4oHgA==", "dev": true }, "node_modules/@nativescript/core": { diff --git a/package.json b/package.json index cb345599..a472e110 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "upng-js": "^2.1.0" }, "devDependencies": { - "@nativescript/android": "9.0.2", + "@nativescript/android": "9.0.4", "@nativescript/types": "~9.0.0", "@nativescript/webpack": "~5.0.25", "typescript": "~5.4.0"