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

test: Use set sysroot for more NDK compatibility #33848

Merged
merged 1 commit into from
May 29, 2016

Conversation

alexcrichton
Copy link
Member

Recent versions of the Android NDK no longer ship debuggers like
arm-linux-androideabi-gdb, but instead one prebuilt binary gdb. We can
symlink this into place at least to get our detection still working, but it now
needs to be told what the sysroot is so it can correctly do... something. Long
story short, tests didn't pass with this change and after this change they pass.

Recent versions of the Android NDK no longer ship debuggers like
`arm-linux-androideabi-gdb`, but instead one prebuilt binary `gdb`. We can
symlink this into place at least to get our detection still working, but it now
needs to be told what the sysroot is so it can correctly do... something. Long
story short, tests didn't pass with this change and after this change they pass.
@rust-highfive
Copy link
Collaborator

r? @brson

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

@alexcrichton
Copy link
Member Author

r? @michaelwoerister

This, in combination with #33832 should enable us to move to the r11c NDK and API level 9 for our Android builders

@michaelwoerister
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented May 24, 2016

📌 Commit 0f3e865 has been approved by michaelwoerister

@alexcrichton
Copy link
Member Author

Ok, I've now verified that this plus #33832 gets a green build on Android, bringing improvements like:

  • The ARM and x86 API level for nightlies goes from 18 to 9
  • An AArch64 nightly is also created
  • We're using the r11c NDK (most recent)

I haven't deployed the buildbot changes just yet, and I'm hesitant to do so. These two changes are required and not present on the beta branch, so if we upgrade buildbot we'll be unable to build a new beta compiler (unless we use a different image to build a beta compiler than the nightly compiler. To me, there's a few courses of action to take here:

  1. We wait for these changes to make their way to the beta channel, then we upgrade the bots. This means that all channels can build on the new bots, but delays these changes by another 6 weeks (notably releasing the aarch64-linux-android target).
  2. We backport these two changes to beta and immediately upgrade the bots. We'll be in trouble if we need a stable point release, but we can make it work if we really need to do that.
  3. We add separate bots for the beta channel for the time being and upgrade the nightly-only bots.

My preferred course of action is (2) as it's the easiest and probably doesn't have any impact anyway. This change isn't related to the build at all and #33832 should in theory be pretty minor as well. As a result I'm going to beta-nominate this and that, and we can discuss.

@alexcrichton alexcrichton added the beta-nominated Nominated for backporting to the compiler in the beta channel. label May 24, 2016
@alexcrichton
Copy link
Member Author

(for those cc'd, see my previous comment)

cc @froydnj - going back to API level 9
cc @pietro - adding aarch64 android

@froydnj
Copy link
Contributor

froydnj commented May 25, 2016

We backport these two changes to beta and immediately upgrade the bots. We'll be in trouble if we need a stable point release, but we can make it work if we really need to do that.

This seems like a reasonable course of action for propagating Android changes sooner.

@michaelwoerister
Copy link
Member

Given the minor impact of the changes, backporting seems fine to me.

@Nercury
Copy link
Contributor

Nercury commented May 26, 2016

In this case, we should also get libc tests going on Android's AArch64.

bors added a commit that referenced this pull request May 28, 2016
Rollup of 15 pull requests

- Successful merges: #33820, #33821, #33822, #33824, #33825, #33831, #33832, #33848, #33849, #33852, #33854, #33856, #33859, #33860, #33861
- Failed merges:
@bors
Copy link
Contributor

bors commented May 29, 2016

⌛ Testing commit 0f3e865 with merge 397cfae...

bors added a commit that referenced this pull request May 29, 2016
…rister

test: Use `set sysroot` for more NDK compatibility

Recent versions of the Android NDK no longer ship debuggers like
`arm-linux-androideabi-gdb`, but instead one prebuilt binary `gdb`. We can
symlink this into place at least to get our detection still working, but it now
needs to be told what the sysroot is so it can correctly do... something. Long
story short, tests didn't pass with this change and after this change they pass.
@bors bors merged commit 0f3e865 into rust-lang:master May 29, 2016
@alexcrichton alexcrichton added the beta-accepted Accepted for backporting to the compiler in the beta channel. label May 31, 2016
@alexcrichton alexcrichton deleted the android-gdb-sysroot branch May 31, 2016 23:29
@alexcrichton
Copy link
Member Author

Discussed with @brson today and like with #33832 we concluded this would be good for backporting.

@brson brson removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label May 31, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants