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

androidenv: autogenerated build-tools and addons repositories #37805

Closed
wants to merge 7 commits into from
Closed

androidenv: autogenerated build-tools and addons repositories #37805

wants to merge 7 commits into from
+768 −48

Conversation

yorickvP
Copy link
Contributor

Motivation for this change

This PR adds two features to the androidenv packages: multiple versions of the android build-tools, and
the google addon repository.

Android apps commonly depend on multiple and/or specific versions of the android build tools. Add support for the buildToolsVersions argument to androidenv, just like platformVersions, in order to support this.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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/)
  • Fits CONTRIBUTING.md.

Sorry, something went wrong.

yorickvP added 7 commits March 26, 2018 00:16
@yorickvP
androidenv: generate m2repository packages from addon.xml
055e5d2
@yorickvP
androidenv: replace support-repository.nix with generated package

Verified

This commit was signed with the committer’s verified signature. The key has expired.
dtzWill Will Dietz
GPG key ID: EBB0EA4124809D02
Expired
Verified
Learn about vigilant mode
43fb4ad
@yorickvP
androidenv: add support for google addons repository
1f14a68
@yorickvP
androidenv: add build tools package generator
e94fca3
@yorickvP
androidenv: add generated build tools packages
d3c5e18
@yorickvP
androidenv: use generated build tools packages with multiple versions
d496721 
Android apps commonly depend on multiple and/or specific versions of
the android build tools. Add support for the buildToolsVersions
argument to androidenv, just like platformVersions, in order
to support this.
@yorickvP
fixup! androidenv: use generated build tools packages with multiple v…
cb2787e 
…ersions
@yorickvP
Copy link
Contributor Author

@taku0 @svanderburg @primeos @rasendubi please look into this if you have time :)

@rasendubi
Copy link
Member

Oh, that's nice!

@GrahamcOfBorg build androidenv.buildTools_all androidenv

@GrahamcOfBorg
Copy link

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: androidenv.buildTools_all, androidenv

Partial log (click to expand)

Cannot nix-instantiate `androidenv.buildTools_all' because:
�[31;1merror:�[0m Platform: aarch64-linux not supported!

Cannot nix-instantiate `androidenv' because:
�[31;1merror:�[0m Platform: aarch64-linux not supported!

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: androidenv.buildTools_all

The following builds were skipped because they don't evaluate on x86_64-darwin: androidenv

Partial log (click to expand)

/nix/store/3i9w5kzc4cnrkncz9c504fpps7cm8yzw-android-build-tools-r24.0.2
/nix/store/4rkkph3qs0rszbhdg14x8wk02938ssls-android-build-tools-r24.0.3
/nix/store/yd756lvkzmja3fy6h41b9hm49i8y9al7-android-build-tools-r25
/nix/store/rh9ikic75bym2l8896jgi6d5jnxq68d8-android-build-tools-r25.0.1
/nix/store/52dkp99ig1rlsgrkgqx1k9nsb6rf0nck-android-build-tools-r25.0.2
/nix/store/x2rcsdzsyxxll9m8kjpcm5isx0g08is9-android-build-tools-r25.0.3
/nix/store/6ppqp3v54qcl52db9ckgs9wygkmsr8dq-android-build-tools-r26
/nix/store/a00v0zk1wh5nkzg7r4p6x9fwnvppisn7-android-build-tools-r26-rc1
/nix/store/lmiky11asgb8zjr3pa1zv56rffcq42qr-android-build-tools-r26-rc2
/nix/store/pyyfqn3ihf1xvhksf5qj9wncif235psp-android-build-tools-r26.0.1

@rasendubi
Copy link
Member

Can we add build-tools-26.0.2, so I can close #36911?

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: androidenv.buildTools_all, androidenv

Partial log (click to expand)

/nix/store/ghwl1261yl8ib8g5zzykiw49dsdiygyk-android-sdk-25.2.5
/nix/store/02xhj03xs3yvv873jyxqi4hvh1jrm47z-android-sdk-25.2.5
/nix/store/z2hsfi44mxrr1nm7xvnrz2szp7nxnw28-android-sdk-25.2.5
/nix/store/yzx9ybq3hk3wai0iisrlca8p8amq1bbn-android-sdk-25.2.5
/nix/store/b2w8zs9zy6rsmjkd93c8wa7f7qipr2wz-android-sdk-25.2.5
/nix/store/88s779il066i58x6qs3f425hai4w73n0-android-sdk-25.2.5
/nix/store/l206lmn4yvj5piqqvii4gdwa6xv3jy1k-android-build-tools-r26.0.1
/nix/store/qm1fcnla9cyiasigjd1hsr5gq32xxh2q-android-platform-tools-r26.0.2
/nix/store/5h29pk0h2wpahxl1qxjqmzmhvvbjfx6x-android-support-r23.2.1
/nix/store/qpsdbd5v2713sfpgziimhj89xhqv3vaz-android_m2repository-47

@taku0
Copy link
Contributor

taku0 commented Mar 26, 2018

Maybe, fetch.sh also should be updated.

matthewbauer
matthewbauer requested changes Apr 23, 2018
View reviewed changes
Copy link
Member

@matthewbauer matthewbauer left a comment

Choose a reason for hiding this comment

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

Resolve merge conflict

@tadfisher
Copy link
Contributor

@yorickvP Can you rebase please?

@mmahut
Copy link
Member

mmahut commented Aug 3, 2019

What is the status of this pull request?

@yorickvP
Copy link
Contributor Author

yorickvP commented Aug 4, 2019

I think this is outdated now. If there is still an interest in these features I can take a look at it again.

@yorickvP yorickvP closed this Aug 4, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@matthewbauer matthewbauer

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
7 participants
@yorickvP @rasendubi @GrahamcOfBorg @taku0 @tadfisher @mmahut @matthewbauer