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: 17c -> 18b #50837

Merged
merged 1 commit into from Dec 15, 2018
Merged

androidndk: 17c -> 18b #50837

merged 1 commit into from Dec 15, 2018

Conversation

bkchr
Copy link
Contributor

@bkchr bkchr commented Nov 20, 2018 •
edited

Motivation for this change
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.

@aanderse
Copy link
Member

Changelog: https://github.com/android-ndk/ndk/wiki/Changelog-r18

@matthewbauer matthewbauer merged commit 676b840 into NixOS:master Dec 15, 2018
@hedning
Copy link
Contributor

hedning commented Dec 16, 2018

This misses a required patch:

nixpkgs/pkgs/development/mobile/androidenv/androidndk.nix

Line 56 in b26ba90

-d $out/libexec/${name} < ${ ./. + "/make_standalone_toolchain.py_" + "${version}" + ".patch" }

broke the nixos tarball

I tried to copying the patch from 17c, but that only worked if I removed the 3 last hunks. Not sure if that's correct.

@bkchr bkchr mentioned this pull request Dec 16, 2018
Merged
10 tasks
@bkchr
Copy link
Contributor Author

bkchr commented Dec 16, 2018

@hedning sorry! I opened a new pull request to fix this: #52339

@bkchr bkchr deleted the android_ndk_18_b branch December 16, 2018 09:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@bkchr @aanderse @hedning @matthewbauer @GrahamcOfBorg