Adjust build scripts for changed SQLite JNI libs

- Fix Mac code signing due to renamed JNI libs - Strip unsupported natives PiperOrigin-RevId: 607292276 Change-Id: I8935e9c2d90a9a2073b485e125968f671707deca
google · Feb 15, 2024 · 2fa7a6c · 2fa7a6c
1 parent 0bea27a
commit 2fa7a6c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/java/ui/build.gradle b/java/ui/build.gradle
@@ -88,11 +88,15 @@ shadowJar {
             // Unsupported platforms: FreeBSD/DragonFly, remove 32-bit
             'org/sqlite/native/DragonFlyBSD/**',
             'org/sqlite/native/FreeBSD/**',
-            'org/sqlite/native/Linux/android-arm/**',
+            'org/sqlite/native/Linux-Android/**',
             'org/sqlite/native/Linux/arm/**',
+            'org/sqlite/native/Linux/armv6/**',
             'org/sqlite/native/Linux/armv7/**',
             'org/sqlite/native/Linux/ppc64/**',
             'org/sqlite/native/Linux/x86/**',
+            'org/sqlite/native/Linux-Musl/x86/**',
+            'org/sqlite/native/Windows/aarch64/**',
+            'org/sqlite/native/Windows/armv7/**',
             'org/sqlite/native/Windows/x86/**')
 }
 

diff --git a/kokoro/dmg/build.sh b/kokoro/dmg/build.sh
@@ -125,8 +125,8 @@ if [[ $1 == release ]]; then
     --entitlements packaging/dmg/BinDiff.entitlements \
     --sign "Developer ID Application: Google LLC (EQHXZ8M8AV)" \
     --keychain "${HOME}/Library/Keychains/MacApplicationSigning.keychain" \
-    jardir/org/sqlite/native/Mac/aarch64/libsqlitejdbc.jnilib \
-    jardir/org/sqlite/native/Mac/x86_64/libsqlitejdbc.jnilib \
+    jardir/org/sqlite/native/Mac/aarch64/libsqlitejdbc.dylib \
+    jardir/org/sqlite/native/Mac/x86_64/libsqlitejdbc.dylib \
     "${app_dir}/BinDiff.app/Contents/runtime-arm64/Contents/MacOS/libjli.dylib" \
     "${app_dir}/BinDiff.app/Contents/runtime-x86_64/Contents/MacOS/libjli.dylib"
   (cd jardir; jar -c -m META-INF/MANIFEST.MF -f \