Skip to content

/ servo

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

Upgrade NDK to v15c. #21780

Merged
merged 1 commit into from May 1, 2019
Merged

Upgrade NDK to v15c. #21780

merged 1 commit into from May 1, 2019

Conversation

@jdm
Copy link
Member

jdm commented Sep 21, 2018 •
edited by SimonSapin

This upgrades us to a more recent NDK to address that outstanding technical debt.

This change is Reviewable
@highfive
Copy link

highfive commented Sep 21, 2018

Heads up! This PR modifies the following files:

  • @wafflespeanut: python/servo/command_base.py, python/servo/build_commands.py, python/servo/bootstrap_commands.py
@jdm jdm force-pushed the jdm:ndk15upgrade branch from fad6549 to 01e9d9e Sep 21, 2018
@jdm
Copy link
Member Author

jdm commented Sep 21, 2018

@bors-servo try=android
@bors-servo
Copy link
Contributor

bors-servo commented Sep 21, 2018

⌛ Trying commit 01e9d9e with merge 6999271...
bors-servo added a commit that referenced this pull request Sep 21, 2018
@bors-servo
Auto merge of #21780 - jdm:ndk15upgrade, r=<try>
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
6999271 
Upgrade NDK to v15c.

This upgrades us to a more recent NDK to address that outstanding technical debt.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/21780)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Sep 21, 2018

💔 Test failed - android-x86
@jdm
Copy link
Member Author

jdm commented Sep 21, 2018

The build machines have cmake 3.2.2 and require 3.6.0.
@atouchet
Copy link
Contributor

atouchet commented Sep 21, 2018

If APP_PLATFORM is being updated to 21 should minSdkVersion in https://github.com/servo/servo/blob/master/support/android/apk/servoapp/build.gradle be set to 21 as well?
@jdm jdm mentioned this pull request Sep 21, 2018
Closed
@bors-servo
Copy link
Contributor

bors-servo commented Sep 24, 2018

☔ The latest upstream changes (presumably #21777) made this pull request unmergeable. Please resolve the merge conflicts.
@nox
Copy link
Member

nox commented Nov 22, 2018

What's the status of this PR?
@nox nox removed the S-awaiting-review label Nov 22, 2018
@jdm jdm force-pushed the jdm:ndk15upgrade branch from 01e9d9e to 97e0f21 May 1, 2019
@jdm
Copy link
Member Author

jdm commented May 1, 2019

@bors-servo try=android
@bors-servo
Copy link
Contributor

bors-servo commented May 1, 2019

⌛ Trying commit 97e0f21 with merge 9c6f57b...
bors-servo added a commit that referenced this pull request May 1, 2019
@bors-servo
Auto merge of #21780 - jdm:ndk15upgrade, r=<try>
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
9c6f57b 
Upgrade NDK to v15c.

This upgrades us to a more recent NDK to address that outstanding technical debt.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/21780)
<!-- Reviewable:end -->
@CYBAI CYBAI removed the S-needs-rebase label May 1, 2019
@bors-servo
Copy link
Contributor

bors-servo commented May 1, 2019

💔 Test failed - status-taskcluster
@jdm jdm force-pushed the jdm:ndk15upgrade branch from 97e0f21 to 808730e May 1, 2019
@highfive highfive removed the S-tests-failed label May 1, 2019
@jdm
Copy link
Member Author

jdm commented May 1, 2019

@bors-servo try=android
@bors-servo
Copy link
Contributor

bors-servo commented May 1, 2019

⌛ Trying commit 808730e with merge 0cce5de...
bors-servo added a commit that referenced this pull request May 1, 2019
@bors-servo
Auto merge of #21780 - jdm:ndk15upgrade, r=<try>
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
0cce5de 
Upgrade NDK to v15c.

This upgrades us to a more recent NDK to address that outstanding technical debt.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/21780)
<!-- Reviewable:end -->
@jdm jdm force-pushed the jdm:ndk15upgrade branch from 014304e to efde6e6 May 1, 2019
@highfive highfive removed the S-tests-failed label May 1, 2019
@jdm
Copy link
Member Author

jdm commented May 1, 2019

r? @asajeffrey
@highfive highfive assigned asajeffrey and unassigned nox May 1, 2019
@jdm jdm force-pushed the jdm:ndk15upgrade branch from efde6e6 to 0a2ad5c May 1, 2019
@jdm
Copy link
Member Author

jdm commented May 1, 2019

This is a prerequisite for the android build in #23163.
@asajeffrey
asajeffrey approved these changes May 1, 2019
View changes
Copy link
Member

asajeffrey left a comment

LGTM. Oh the joys of guessing paths in the NDK.
@Manishearth
Manishearth reviewed May 1, 2019
View changes
python/servo/build_commands.py Outdated
if lines[1].split(' = ')[1].split('.')[0] != '12':
print("Currently only support NDK 12.")
if lines[1].split(' = ')[1].split('.')[0] != '15':
print("Currently only support NDK 15.")

This comment has been minimized.

Sign in to view
@Manishearth

Manishearth May 1, 2019

Member

Probably should also say something like "please delete the android-toolchains folder and rerun bootstrap-android"
@jdm jdm force-pushed the jdm:ndk15upgrade branch from 0a2ad5c to 9eae604 May 1, 2019
@jdm
Copy link
Member Author

jdm commented May 1, 2019

Verified that this produces a runnable android build on my pixel 1.
@bors-servo r=asajeffrey
@bors-servo
Copy link
Contributor

bors-servo commented May 1, 2019

📌 Commit 9eae604 has been approved by asajeffrey
@bors-servo
Copy link
Contributor

bors-servo commented May 1, 2019

⌛ Testing commit 9eae604 with merge 15995cf...
bors-servo added a commit that referenced this pull request May 1, 2019
@bors-servo
Auto merge of #21780 - jdm:ndk15upgrade, r=asajeffrey
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
15995cf 
Upgrade NDK to v15c.

This upgrades us to a more recent NDK to address that outstanding technical debt.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/21780)
<!-- Reviewable:end -->
@jdm
Upgrade NDK to v15c.
Loading status checks…
7a95cbc
@jdm jdm force-pushed the jdm:ndk15upgrade branch from 9eae604 to 7a95cbc May 1, 2019
@jdm
Copy link
Member Author

jdm commented May 1, 2019

@bors-servo r=asajeffrey
@bors-servo
Copy link
Contributor

bors-servo commented May 1, 2019

📌 Commit 7a95cbc has been approved by asajeffrey
@bors-servo
Copy link
Contributor

bors-servo commented May 1, 2019

⌛ Testing commit 7a95cbc with merge 834d319...
bors-servo added a commit that referenced this pull request May 1, 2019
@bors-servo
Auto merge of #21780 - jdm:ndk15upgrade, r=asajeffrey
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
834d319 
Upgrade NDK to v15c.

This upgrades us to a more recent NDK to address that outstanding technical debt.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/21780)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented May 1, 2019

☀️ Test successful - android-mac, arm32, arm64, linux-rel-css, linux-rel-wpt, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, magicleap, status-taskcluster
Approved by: asajeffrey
Pushing 834d319 to master...
@bors-servo bors-servo merged commit 7a95cbc into servo:master May 1, 2019
4 checks passed
4 checks passed
Taskcluster (pull_request) TaskGroup: success
Details
Travis CI - Pull Request Build Passed
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
homu Test successful
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Manishearth Manishearth

@asajeffrey asajeffrey

Assignees

@asajeffrey asajeffrey

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

8 participants
@jdm @highfive @bors-servo @atouchet @nox @asajeffrey @Manishearth @CYBAI
You can’t perform that action at this time.