Join GitHub today
GitHub is home to over 50 million developers working together to host and review code, manage projects, and build software together.
Sign upUpdate android-18 menu entry to 8 for SDK r24 #290
Conversation
|
Newest version seems to install |
It seems that the output of `android list sdk` changes over time, so we should not rely on its ordering of menu items. Instead, we can use stable identifiers that don't change.
aneeshusa
force-pushed the
aneeshusa:update-android-18-menu-entry-for-sdk-r24
branch
from
6c7f577
to
da097a4
|
Update: newest version is much simpler and seems to work properly in Vagrant. Can't believe I never tried this before. |
|
Oh, nice! Is this ready to go? |
|
Yup, this is ready to get reviewed - make sure to double check that it installs |
|
Ping on this; |
|
@bors-servo r+ |
|
|
…24, r=larsbergstrom Update android-18 menu entry to 8 for SDK r24 We're ignoring Travis builds for the cross builder and this fix needs to be verified in Vagrant (this VM takes a while to provision unfortunately). We may want to actually try running a build in Vagrant to see if this works. We updated to Android SDK r24 in November from r23, but did not update the menu entry to install the android-18 target. The new number comes from the output of `./android sdk list`. We need to delete the `/home/servo/android/sdk/r24.4.1` folder before applying this fix to the builders. Ideally this would get checked for by Salt, but currently you can only specify one file for the ` - creates: ` key of `cmd.run`, and our state creates the `platform-tools` dir and the `android-18` dir. I'll open a Salt issue for this. cc @larsbergstrom, servo/servo#10339 <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/saltfs/290) <!-- Reviewable:end -->
|
|
|
Heads up - I believe this will require some manual intervention to get Salt to apply the changes. Deleting the |
|
Thanks! Indeed, I rolled this out manually after landing it and noticing that highstate thought that nothing needed to be modified :-) |
|
See #383 for the follow-up PR. |
aneeshusa commentedApr 2, 2016
We're ignoring Travis builds for the cross builder and this fix needs to be verified in Vagrant (this VM takes a while to provision unfortunately). We may want to actually try running a build in Vagrant to see if this works.
We updated to Android SDK r24 in November from r23, but did not update
the menu entry to install the android-18 target. The new number comes
from the output of
./android sdk list.We need to delete the
/home/servo/android/sdk/r24.4.1folder before applying this fix to the builders. Ideally this would get checked for by Salt, but currently you can only specify one file for the- creates:key ofcmd.run, and our state creates theplatform-toolsdir and theandroid-18dir. I'll open a Salt issue for this.cc @larsbergstrom, servo/servo#10339
This change is