diff --git a/android/b_android.sh b/android/b_android.sh index a95c727..6f52233 100644 --- a/android/b_android.sh +++ b/android/b_android.sh @@ -1,3 +1,2 @@ #!/bin/bash -cargo ndk -t armeabi-v7a -t arm64-v8a -t x86 -t x86_64 -o lib-ezlog/src/main/jniLibs build -Zbuild-std -p ezlog --features "android_logger" --release -./gradlew :lib-ezlog:assembleRelease \ No newline at end of file +cargo ndk -t armeabi-v7a -t arm64-v8a -t x86 -t x86_64 -o lib-ezlog/src/main/jniLibs build -Zbuild-std -p ezlog --features "android_logger" --release \ No newline at end of file diff --git a/android/lib-ezlog/.gitignore b/android/lib-ezlog/.gitignore index 42afabf..c9b3f98 100644 --- a/android/lib-ezlog/.gitignore +++ b/android/lib-ezlog/.gitignore @@ -1 +1,2 @@ -/build \ No newline at end of file +/build +/src/main/jniLibs \ No newline at end of file diff --git a/android/lib-ezlog/build.gradle b/android/lib-ezlog/build.gradle index 11f1217..eb3157a 100644 --- a/android/lib-ezlog/build.gradle +++ b/android/lib-ezlog/build.gradle @@ -4,4 +4,12 @@ dependencies { testImplementation("junit:junit:4.13.2") androidTestImplementation "androidx.test:runner:1.5.2" androidTestImplementation "androidx.test:rules:1.5.0" -} \ No newline at end of file +} + + +task buildRust(type: Exec) { + workingDir '../' + commandLine 'sh', 'b_android.sh' +} + +preBuild.dependsOn buildRust \ No newline at end of file diff --git a/android/lib-ezlog/src/main/jniLibs/arm64-v8a/libezlog.so b/android/lib-ezlog/src/main/jniLibs/arm64-v8a/libezlog.so deleted file mode 100755 index f4e6c71..0000000 Binary files a/android/lib-ezlog/src/main/jniLibs/arm64-v8a/libezlog.so and /dev/null differ diff --git a/android/lib-ezlog/src/main/jniLibs/armeabi-v7a/libezlog.so b/android/lib-ezlog/src/main/jniLibs/armeabi-v7a/libezlog.so deleted file mode 100755 index 8feff00..0000000 Binary files a/android/lib-ezlog/src/main/jniLibs/armeabi-v7a/libezlog.so and /dev/null differ diff --git a/android/lib-ezlog/src/main/jniLibs/x86/libezlog.so b/android/lib-ezlog/src/main/jniLibs/x86/libezlog.so deleted file mode 100755 index 1689cec..0000000 Binary files a/android/lib-ezlog/src/main/jniLibs/x86/libezlog.so and /dev/null differ diff --git a/android/lib-ezlog/src/main/jniLibs/x86_64/libezlog.so b/android/lib-ezlog/src/main/jniLibs/x86_64/libezlog.so deleted file mode 100755 index f792f0a..0000000 Binary files a/android/lib-ezlog/src/main/jniLibs/x86_64/libezlog.so and /dev/null differ