Export Android platform vars from ndk-env#203
Merged
Conversation
Signed-off-by: Matthew Stanton <stantonmatthewj@gmail.com>
Owner
|
If you could add another PR that makes the nightly clippy happy, that would be appreciated. 😄 |
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.
Closes #198.
cargo ndk buildalready makesANDROID_PLATFORMandANDROID_ABIavailable to build scripts, butcargo ndk-envdid not include them in its generated environment. This threads the selected platform and Android ABI through the shared environment builder sondk-env,ndk-test, and the normal cargo command path use the same values.I also added a focused regression test for the generated environment map.
Validation:
cargo fmt --all -- --checkcargo test build_env_exports_android_platform_and_abi --lockedcargo test --lockedcargo clippy -- -D warningscargo install --locked --path . --root .codex-tmp/cargo-install/cargo-ndkcargo ndk-env --target arm64-v8a --platform 28 --jsonwith a project-local fake NDKsource.properties, checkedANDROID_PLATFORM=28,ANDROID_ABI=arm64-v8a, andCARGO_NDK_ANDROID_PLATFORM=28--powershellgit diff --check