From 2fa7a6c3295ab374bc25177d044cb8a7e9a2a726 Mon Sep 17 00:00:00 2001 From: Christian Blichmann Date: Thu, 15 Feb 2024 04:48:33 -0800 Subject: [PATCH] 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 --- java/ui/build.gradle | 6 +++++- kokoro/dmg/build.sh | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/java/ui/build.gradle b/java/ui/build.gradle index 1a432717..b5a38a6c 100644 --- 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 index 5be4a427..264be6f9 100755 --- 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 \