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

ci: Update android ndk and sdk #41863

Merged
merged 1 commit into from
May 11, 2017
Merged

Conversation

malbarbo
Copy link
Contributor

@malbarbo malbarbo commented May 9, 2017

Make install-sdk.sh and install-ndk.sh more generic so future updates can be made directly on Dockerfile. Update ndk to r13b, which will be necessary to make host builds for android (in the future). Update sdk to r25.2.5 (maybe some emulator performance improvement).

@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

(rust_highfive has picked a reviewer for you, use r? to override)

@malbarbo
Copy link
Contributor Author

malbarbo commented May 9, 2017

r? @alexcrichton

@kennytm
Copy link
Member

kennytm commented May 9, 2017

Why not use the latest stable versions i.e. NDK r14b, SDK r26.0.2?

@malbarbo
Copy link
Contributor Author

malbarbo commented May 9, 2017

NDK r14b are deprecating gcc, so I though it would be better to stay with r13b for while. SDK r25.3 removed tools/android (in favor of avdmanager), a compatibility layer was add in r26.0.2, but I had some problems with it.

@alexcrichton
Copy link
Member

@bors: r+

Looks great!

If you'd like to look into having the containers share files as well (e.g. to avoid this script duplication) I'd also be totally on board with that, but I'm also fine having duplication for now as well.

@bors
Copy link
Contributor

bors commented May 9, 2017

📌 Commit 49f793a has been approved by alexcrichton

@malbarbo
Copy link
Contributor Author

malbarbo commented May 9, 2017

If you'd like to look into having the containers share files as well (e.g. to avoid this script duplication) I'd also be totally on board with that, but I'm also fine having duplication for now as well.

Oh, that's funny that you asked it. I was about to open a issue about it. After this got merged I will open a PR then, so you can see what's my idea about a migration path to shared files.

@alexcrichton
Copy link
Member

👍

I think you'll find... a nontrivial amount of duplication! Don't feel the need to tackle it all at once though, we can do this incrementally.

frewsxcv added a commit to frewsxcv/rust that referenced this pull request May 10, 2017
…alexcrichton

ci: Update android ndk and sdk

Make install-sdk.sh and install-ndk.sh more generic so future updates can be made directly on Dockerfile. Update ndk to r13b, which will be necessary to make host builds for android (in the future). Update sdk to r25.2.5 (maybe some emulator performance improvement).
@TimNN TimNN mentioned this pull request May 10, 2017
frewsxcv added a commit to frewsxcv/rust that referenced this pull request May 10, 2017
…alexcrichton

ci: Update android ndk and sdk

Make install-sdk.sh and install-ndk.sh more generic so future updates can be made directly on Dockerfile. Update ndk to r13b, which will be necessary to make host builds for android (in the future). Update sdk to r25.2.5 (maybe some emulator performance improvement).
@TimNN TimNN added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label May 10, 2017
frewsxcv added a commit to frewsxcv/rust that referenced this pull request May 11, 2017
…alexcrichton

ci: Update android ndk and sdk

Make install-sdk.sh and install-ndk.sh more generic so future updates can be made directly on Dockerfile. Update ndk to r13b, which will be necessary to make host builds for android (in the future). Update sdk to r25.2.5 (maybe some emulator performance improvement).
@bors
Copy link
Contributor

bors commented May 11, 2017

⌛ Testing commit 49f793a with merge fb6f845...

bors added a commit that referenced this pull request May 11, 2017
ci: Update android ndk and sdk

Make install-sdk.sh and install-ndk.sh more generic so future updates can be made directly on Dockerfile. Update ndk to r13b, which will be necessary to make host builds for android (in the future). Update sdk to r25.2.5 (maybe some emulator performance improvement).
@bors
Copy link
Contributor

bors commented May 11, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing fb6f845 to master...

@bors bors merged commit 49f793a into rust-lang:master May 11, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants