Skip to content

Commit

Permalink
merge jni lib folder after cargo build
Browse files Browse the repository at this point in the history
This fixes an issue where the `jni` folder is only included after the second `./gradlew assembleRelease` build.
  • Loading branch information
sleeyax committed Mar 31, 2023
1 parent 5880578 commit d649bf7
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- name: Add x86_64 target
run: rustup target add x86_64-linux-android
- name: Build aar
run: ./gradlew assembleRelease && ./gradlew assembleRelease
run: ./gradlew assembleRelease
- name: Upload build artifacts
uses: svenstaro/upload-release-action@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ protobuf {
}

tasks.whenTaskAdded { task ->
if (task.name == "javaPreCompileDebug" || task.name == "javaPreCompileRelease") {
if (task.name == "javaPreCompileDebug" || task.name == "javaPreCompileRelease" || task.name == 'mergeDebugJniLibFolders' || task.name == 'mergeReleaseJniLibFolders') {
task.dependsOn "cargoBuild"
}
}

0 comments on commit d649bf7

Please sign in to comment.