From 09ad4755922ef9d10999032c846819deb496dc2b Mon Sep 17 00:00:00 2001 From: tangowithfoxtrot <5676771+tangowithfoxtrot@users.noreply.github.com> Date: Fri, 29 Nov 2024 23:56:37 +0000 Subject: [PATCH] Fix path in Android build script (#34) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## 📔 Objective When following the Contributing Docs to build the Android app, the build script couldn't find my `libbitwarden_uniffi.so` file. It seems the path for this changed in #26. This just updates the build script to use the new path. ## ⏰ Reminders before review - Contributor guidelines followed - All formatters and local linters executed and passed - Written new unit and / or integration tests where applicable - Protected functional changes with optionality (feature flags) - Used internationalization (i18n) for all UI strings - CI builds passed - Communicated to DevOps any deployment requirements - Updated any necessary documentation (Confluence, contributing docs) or informed the documentation team ## đŸĻŽ Reviewer guidelines - 👍 (`:+1:`) or similar for great changes - 📝 (`:memo:`) or ℹī¸ (`:information_source:`) for notes or general info - ❓ (`:question:`) for questions - 🤔 (`:thinking:`) or 💭 (`:thought_balloon:`) for more open inquiry that's not quite a confirmed issue and could potentially benefit from discussion - 🎨 (`:art:`) for suggestions / improvements - ❌ (`:x:`) or ⚠ī¸ (`:warning:`) for more significant problems or concerns needing attention - 🌱 (`:seedling:`) or â™ģī¸ (`:recycle:`) for future improvements or indications of technical debt - ⛏ (`:pick:`) for minor or nitpick changes --- crates/bitwarden-uniffi/kotlin/publish-local.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/crates/bitwarden-uniffi/kotlin/publish-local.sh b/crates/bitwarden-uniffi/kotlin/publish-local.sh index 68e67455..3f77e3b7 100755 --- a/crates/bitwarden-uniffi/kotlin/publish-local.sh +++ b/crates/bitwarden-uniffi/kotlin/publish-local.sh @@ -2,12 +2,13 @@ set -e cd "$(dirname "$0")" +SDK_REPO_ROOT="$(git rev-parse --show-toplevel)" mkdir -p ./sdk/src/main/jniLibs/{arm64-v8a,armeabi-v7a,x86_64,x86} # Build arm64 for emulator cross build -p bitwarden-uniffi --release --target=aarch64-linux-android -mv ../../target/aarch64-linux-android/release/libbitwarden_uniffi.so ./sdk/src/main/jniLibs/arm64-v8a/libbitwarden_uniffi.so +mv $SDK_REPO_ROOT/target/aarch64-linux-android/release/libbitwarden_uniffi.so ./sdk/src/main/jniLibs/arm64-v8a/libbitwarden_uniffi.so # Generate latest bindings ./build-schemas.sh