Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

androidndk: Fix version selection #42378

Merged
merged 2 commits into from Jun 22, 2018
Merged

androidndk: Fix version selection #42378

merged 2 commits into from Jun 22, 2018

Conversation

matthewbauer
Copy link
Member

@matthewbauer matthewbauer commented Jun 22, 2018 •
edited by Ericson2314

Motivation for this change

bionic was improperly ignoring the version. This fixes that, and also improves things so that such lapses are less likely in the future.

/cc @bkchr

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

@matthewbauer
android: Use NDK 17 for aarch32
cf09ffe
@matthewbauer
android: add ndkVer to resolve ndk ambiguity
c8fd285 
It wasn’t exactly clear which NDK you were using previously. This adds
an attribute to system that handles what version of the NDK we should
use when building things.

/cc @Ericson2314
@GrahamcOfBorg GrahamcOfBorg added the 6.topic: stdenv Standard environment label Jun 22, 2018
@Ericson2314 Ericson2314 changed the title Fix android32 androidndk: Fix version selection Jun 22, 2018
Ericson2314
Ericson2314 approved these changes Jun 22, 2018
View reviewed changes
Copy link
Member

@Ericson2314 Ericson2314 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed the title and description, but this looks great!

@matthewbauer matthewbauer merged commit 6c17928 into NixOS:master Jun 22, 2018
@Ericson2314 Ericson2314 deleted the fix-android32 branch June 22, 2018 18:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ericson2314 Ericson2314 Ericson2314 approved these changes

@bkchr bkchr bkchr approved these changes

@nbp nbp Awaiting requested review from nbp

Assignees
No one assigned
Labels
6.topic: stdenv Standard environment 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@matthewbauer @Ericson2314 @bkchr @GrahamcOfBorg