Respect custom Cargo target dir in JNI build#672
Open
dannyward630 wants to merge 1 commit into
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
cargo metadatatarget/...--artifact-dirWhy
java/build_jni.shrespected Cargo's configured target directory during the build, but then copied desktop/server libraries fromtarget/$triple/.... That breaks users who setCARGO_TARGET_DIRor configurebuild.target-dir, as reported in #655.Validation
bash -n bin/build_helpers.sh java/build_jni.shgit diff --checkjava/build_jni.sh desktopwith a fakecargo/rustcandCARGO_TARGET_DIRset to a temp custom directory; the script copiedlibsignal_jni_amd64.dylibandlibsignal_jni_testing_amd64.dylibfrom that custom target directory intojava/client/src/main/resourcesI could not run the full Rust/JNI build in this local environment because
cargois not installed on this machine.Fixes #655.