Roll Android SDK to N-MR1

Roll Android SDK to N-MR1

BUG=688263
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.android:android_cronet_tester

Review-Url: https://codereview.chromium.org/2760383003
Cr-Commit-Position: refs/heads/master@{#460934}
Committed: https://chromium.googlesource.com/chromium/src/+/7c263053681fd4e5297e2f69268587604123e1c0

[mikecase (-- gone --), 2017-03-21 20:06:59]

Description was changed from

==========
Upgrade android_tools to N-MR1

BUG=688263
==========

to

==========
Upgrade android_tools to N-MR1

BUG=688263
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.android:android_cronet_tester
==========

[mikecase (-- gone --), 2017-03-21 20:07:19]

Description was changed from

==========
Upgrade android_tools to N-MR1

BUG=688263
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.android:android_cronet_tester
==========

to

==========
Roll Android SDK to N-MR1

BUG=688263
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.android:android_cronet_tester
==========

[mikecase (-- gone --), 2017-03-21 21:20:47]

mikecase@chromium.org changed reviewers:
+ jbudorick@chromium.org

[mikecase (-- gone --), 2017-03-21 21:20:47]

So, initial trybot runs are green. I assume after a few more test runs (and Ill
run the android-device unittests from catapult/ locally) this should be good to
go.

[Peter Wen, 2017-03-22 16:00:41]

Description was changed from

==========
Roll Android SDK to N-MR1

BUG=688263
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.android:android_cronet_tester
==========

to

==========
Roll Android SDK to N-MR1

BUG=688263
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.android:android_cronet_tester
==========

[mikecase (-- gone --), 2017-03-27 23:47:06]

I dont get why some of these bots are having merge conflicts on DEPS file.
Doesnt make sense.

[mikecase (-- gone --), 2017-03-28 15:54:29]

The CQ bit was checked by mikecase@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-03-28 15:55:11]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-03-28 16:56:41]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-03-28 16:56:42]

Dry run: This issue passed the CQ dry run.

[mikecase (-- gone --), 2017-03-29 18:32:05]

friendly ping :)

[mikecase (-- gone --), 2017-03-29 18:47:33]

mikecase@chromium.org changed reviewers:
+ agrieve@chromium.org

[agrieve, 2017-03-29 20:34:06]

On 2017/03/29 18:47:34, mikecase wrote:

lgtm - wonder if you had to do anything with lint this time?

[mikecase (-- gone --), 2017-03-29 23:38:53]

mikecase@chromium.org changed reviewers:
+ pauljensen@chromium.org

[mikecase (-- gone --), 2017-03-29 23:38:54]

+ pauljensen@chromium.org for OWNER of components/cronet/android

[pauljensen, 2017-03-29 23:46:07]

components/cronet/android lgtm

[jbudorick, 2017-03-30 00:15:14]

lgtm % agrieve's q

https://codereview.chromium.org/2760383003/diff/40001/build/android/devil_chr...
File build/android/devil_chromium.json (left):

https://codereview.chromium.org/2760383003/diff/40001/build/android/devil_chr...
build/android/devil_chromium.json:8:
"../../third_party/android_tools/sdk/build-tools/24.0.2/aapt"
I imagine we could do something clever with this file and GN, though I don't
think we should do so in this CL.

[agrieve, 2017-03-30 03:15:57]

https://codereview.chromium.org/2760383003/diff/40001/build/android/devil_chr...
File build/android/devil_chromium.json (left):

https://codereview.chromium.org/2760383003/diff/40001/build/android/devil_chr...
build/android/devil_chromium.json:8:
"../../third_party/android_tools/sdk/build-tools/24.0.2/aapt"
On 2017/03/30 00:15:14, jbudorick wrote:
> I imagine we could do something clever with this file and GN, though I don't
> think we should do so in this CL.

If it's okay to add a build-dir requirement here, you could read the value from
$root_build_dir/build_vars.txt

[jbudorick, 2017-03-30 03:20:50]

https://codereview.chromium.org/2760383003/diff/40001/build/android/devil_chr...
File build/android/devil_chromium.json (left):

https://codereview.chromium.org/2760383003/diff/40001/build/android/devil_chr...
build/android/devil_chromium.json:8:
"../../third_party/android_tools/sdk/build-tools/24.0.2/aapt"
On 2017/03/30 03:15:57, agrieve wrote:
> On 2017/03/30 00:15:14, jbudorick wrote:
> > I imagine we could do something clever with this file and GN, though I don't
> > think we should do so in this CL.
> 
> If it's okay to add a build-dir requirement here, you could read the value
from
> $root_build_dir/build_vars.txt

devil_chromium.py is already handling bulid products with output directory
dependencies, so something like that might be possible.

In any event, it's probably better to leave that for a separate CL.

[mikecase (-- gone --), 2017-03-30 15:21:01]

Built locally and didn't see any lint spam or lint issues. Ill double-check
today, then commit this.

https://codereview.chromium.org/2760383003/diff/40001/build/android/devil_chr...
File build/android/devil_chromium.json (left):

https://codereview.chromium.org/2760383003/diff/40001/build/android/devil_chr...
build/android/devil_chromium.json:8:
"../../third_party/android_tools/sdk/build-tools/24.0.2/aapt"
On 2017/03/30 at 03:20:50, jbudorick wrote:
> On 2017/03/30 03:15:57, agrieve wrote:
> > On 2017/03/30 00:15:14, jbudorick wrote:
> > > I imagine we could do something clever with this file and GN, though I
don't
> > > think we should do so in this CL.
> > 
> > If it's okay to add a build-dir requirement here, you could read the value
from
> > $root_build_dir/build_vars.txt
> 
> devil_chromium.py is already handling bulid products with output directory
dependencies, so something like that might be possible.
> 
> In any event, it's probably better to leave that for a separate CL.

Yeah, I tried previously to replace this entire devil_chromium.json file with a
templated jinja file...
https://codereview.chromium.org/1812383003

Specifically I did that so devil could use adb from the same SDK that was used
to build with I think?

Anyway, I had to revert. And it had problems. Might reinvestigate.

[mikecase (-- gone --), 2017-03-30 18:51:35]

Built again locally and no lint spam or errors. Going to try to land.

[mikecase (-- gone --), 2017-03-30 18:51:36]

The CQ bit was checked by mikecase@chromium.org

[commit-bot: I haz the power, 2017-03-30 18:52:06]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-03-30 19:57:28]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-03-30 19:57:29]

Try jobs failed on following builders:
  android_cronet_tester on master.tryserver.chromium.android (JOB_FAILED,
https://build.chromium.org/p/tryserver.chromium.android/builders/android_cron...)

[mikecase (-- gone --), 2017-03-30 20:53:59]

Pretty convinced all the failures were flakes or issues with the bots (cronet
tester had a recipe-side issue). Going to try again...

[mikecase (-- gone --), 2017-03-30 20:54:00]

The CQ bit was checked by mikecase@chromium.org

[commit-bot: I haz the power, 2017-03-30 20:55:26]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-03-30 23:46:16]

CQ is committing da patch.

Bot data: {"patchset_id": 40001, "attempt_start_ts": 1490907240588190,
"parent_rev": "8f36c8ad44b223f425bd87e2cd26de9bf35afaec", "commit_rev":
"7c263053681fd4e5297e2f69268587604123e1c0"}

[commit-bot: I haz the power, 2017-03-30 23:48:23]

Description was changed from

==========
Roll Android SDK to N-MR1

BUG=688263
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.android:android_cronet_tester
==========

to

==========
Roll Android SDK to N-MR1

BUG=688263
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.android:android_cronet_tester

Review-Url: https://codereview.chromium.org/2760383003
Cr-Commit-Position: refs/heads/master@{#460934}
Committed:
https://chromium.googlesource.com/chromium/src/+/7c263053681fd4e5297e2f692685...
==========

[commit-bot: I haz the power, 2017-03-30 23:48:25]

Committed patchset #3 (id:40001) as
https://chromium.googlesource.com/chromium/src/+/7c263053681fd4e5297e2f692685...