fix: split android native symbols

Author: ovitrif

.github/workflows/gradle-publish.yml

@@ -16,7 +16,7 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     permissions:
-      contents: read
+      contents: write
       packages: write
 
     steps:
@@ -58,7 +58,7 @@ jobs:
         if [[ -z "$VERSION" ]]; then
           VERSION="$GITHUB_REF_NAME"
         fi
-        echo "version=${VERSION#v}" >> $GITHUB_OUTPUT
+        echo "version=${VERSION#v}" >> "$GITHUB_OUTPUT"
 
     - name: Generate Android bindings
       run: ./build_android.sh
@@ -67,6 +67,18 @@ jobs:
       working-directory: bindings/android
       run: ./gradlew build -Pversion=${{ steps.version.outputs.version }}
 
+    - name: Upload native debug symbols artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: vss-client-native-debug-symbols-${{ steps.version.outputs.version }}
+        path: bindings/android/native-debug-symbols.zip
+
+    - name: Upload native debug symbols to release
+      if: github.event_name == 'release'
+      env:
+        GH_TOKEN: ${{ github.token }}
+      run: gh release upload "${{ github.event.release.tag_name }}" bindings/android/native-debug-symbols.zip --clobber
+
     - name: Publish to GitHub Packages
       working-directory: bindings/android
       env:

.gitignore

@@ -1,6 +1,7 @@
 .idea/
 .DS_Store
 /target/
+bindings/android/native-debug-symbols.zip
 .rust-analyzer/
 .cargo/
 # Default ignored files

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "vss-rust-client-ffi"
-version = "0.5.17"
+version = "0.5.18"
 edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

Cargo.toml

@@ -3,7 +3,7 @@
 
 import PackageDescription
 
-let tag = "v0.5.17"
+let tag = "v0.5.18"
 let checksum = "92c01c752f505d47e22a8ea7b4b3c6ec47b60a9dd877459d9c628d743ce723bf"
 let url = "https://github.com/synonymdev/vss-rust-client-ffi/releases/download/\(tag)/VssRustClientFfi.xcframework.zip"
 

Package.swift

@@ -91,4 +91,4 @@ cd ./bindings/android
 ./gradlew publish -Pversion=0.1.0
 ```
 
-Run `./build_android.sh` before any direct Gradle publish so `jniLibs` is regenerated with native debug metadata and 16 KB page-size alignment.
+Run `./build_android.sh` before any direct Gradle publish so `jniLibs` is regenerated as stripped release libraries with separate `native-debug-symbols.zip` metadata and 16 KB page-size alignment.

bindings/android/README.md

@@ -32,11 +32,6 @@ android {
     kotlinOptions {
         jvmTarget = "11"
     }
-    packaging {
-        jniLibs {
-            keepDebugSymbols += listOf("**/libvss_rust_client_ffi.so")
-        }
-    }
     publishing {
         singleVariant("release") {
             withSourcesJar()
@@ -104,7 +99,7 @@ fun String.parseElfAlignment(): Long {
 
 val validateReleaseNativeLibraries by tasks.registering {
     group = "verification"
-    description = "Validates release JNI libraries keep full DWARF metadata and 16 KB LOAD alignment."
+    description = "Validates release JNI libraries are stripped and keep 16 KB LOAD alignment."
 
     doLast {
         val readelf = findReadelf()
@@ -117,8 +112,11 @@ val validateReleaseNativeLibraries by tasks.registering {
             }
 
             val (sectionsExit, sections) = runReadelf(readelf, "-S", lib.absolutePath)
-            if (sectionsExit != 0 || !Regex("""\.debug_info""").containsMatchIn(sections)) {
-                throw GradleException("Android native library has no .debug_info DWARF metadata: '${lib.path}'")
+            if (sectionsExit != 0) {
+                throw GradleException("Unable to inspect Android native library sections: '${lib.path}'")
+            }
+            if (Regex("""\.debug_""").containsMatchIn(sections)) {
+                throw GradleException("Android release native library still contains .debug_* sections: '${lib.path}'")
             }
 
             val wideHeaders = runReadelf(readelf, "-W", "-l", lib.absolutePath)
@@ -158,6 +156,10 @@ afterEvaluate {
                 version = project.version.toString()
 
                 from(components["release"])
+                artifact(rootProject.layout.projectDirectory.file("native-debug-symbols.zip")) {
+                    classifier = "native-debug-symbols"
+                    extension = "zip"
+                }
                 pom {
                     name.set(mavenArtifactId)
                     description.set("VSS Rust Client Android bindings.")

bindings/android/build.gradle.kts

@@ -3,4 +3,4 @@ android.useAndroidX=true
 android.nonTransitiveRClass=true
 kotlin.code.style=official
 # project settings:
-version=0.5.17
+version=0.5.18