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.

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

[20.09] cc-wrapper: Fix for prebuilt android #97488

Merged
merged 5 commits into from Sep 9, 2020
Merged

[20.09] cc-wrapper: Fix for prebuilt android #97488

merged 5 commits into from Sep 9, 2020

Conversation

Ericson2314
Copy link
Member

Motivation for this change

Backport of #97387.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@Ericson2314
cc-wrapper: Fix for prebuilt android
204dc3a 
We don't want to use Nix-built GCC's libs with prebuilt clang in this
case.
@Ericson2314
deployAndroidPackage: Use pname and version
4c489b5
@Ericson2314
androidndkPkgs: Take version from underlying package
7cac79b 
We can now do this, so let's.
@Ericson2314
lib.systems.examples: Bump android SDK to 21
e2bef8f 
074bc78 evidently meant to do this, but
forgot.
@Ericson2314
androidndk: Avoid depending on target-sensative openjdk
452854a 
We just need jdk for this script that helps set up toolchains. The
script might need to know about the target platform, but the interpreter
that runs it (or part of it) doesn't.
@worldofpeace worldofpeace changed the title cc-wrapper: Fix for prebuilt android -- backport to 20.09 [20.09] cc-wrapper: Fix for prebuilt android Sep 9, 2020
jonringer
jonringer approved these changes Sep 9, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

LGTM

https://github.com/NixOS/nixpkgs/pull/97488
4 packages built:
adbfs-rootless apktool gnirehtet scrcpy

@jonringer jonringer merged commit 2c3d422 into NixOS:release-20.09 Sep 9, 2020
@Ericson2314 Ericson2314 deleted the fix-android-prebuilt branch September 9, 2020 01:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer jonringer approved these changes

@matthewbauer matthewbauer Awaiting requested review from matthewbauer matthewbauer is a code owner

@nbp nbp Awaiting requested review from nbp

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@Ericson2314 @jonringer