[android] Use contextlib_ext.Optional for conditional context managers.

[android] Use contextlib_ext.Optional for conditional context managers.

Scripts in //build/android have been using hand-rolled workarounds for
conditional context managers in the past. This switches them to a new
implementation I added to catapult in
https://codereview.chromium.org/2585763004/

Committed: https://crrev.com/8bfc633a1029b75e665fefe7d01a7b41102212e4
Cr-Commit-Position: refs/heads/master@{#440103}

[jbudorick, 2016-12-21 01:50:10]

Description was changed from

==========
[android] Use contextlib_ext.Optional for conditional context managers.
==========

to

==========
[android] Use contextlib_ext.Optional for conditional context managers.

Scripts in //build/android have been using hand-rolled workarounds for
conditional context managers in the past. This switches them to a new
implementation I added to catapult in
https://codereview.chromium.org/2585763004/
==========

[jbudorick, 2016-12-21 01:50:41]

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

[rnephew (Reviews Here), 2016-12-21 06:49:04]

On 2016/12/21 01:50:41, jbudorick wrote:

lgtm

[jbudorick, 2016-12-21 13:47:39]

The CQ bit was checked by jbudorick@chromium.org

[commit-bot: I haz the power, 2016-12-21 13:47:55]

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, 2016-12-21 13:49:28]

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

[commit-bot: I haz the power, 2016-12-21 13:49:29]

Try jobs failed on following builders:
  ios-device on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios-device/builds...)
  ios-device-xcode-clang on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios-device-xcode-...)
  ios-simulator on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios-simulator/bui...)
  ios-simulator-xcode-clang on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios-simulator-xco...)

[jbudorick, 2016-12-21 14:06:00]

The CQ bit was checked by jbudorick@chromium.org

[jbudorick, 2016-12-21 14:06:01]

The patchset sent to the CQ was uploaded after l-g-t-m from rnephew@chromium.org
Link to the patchset: https://codereview.chromium.org/2593903002/#ps20001
(title: "rebase")

[commit-bot: I haz the power, 2016-12-21 14:06:10]

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, 2016-12-21 15:18:14]

CQ is committing da patch.

Bot data: {"patchset_id": 20001, "attempt_start_ts": 1482329160529180,
"parent_rev": "a792a86d8e53d30b30c2e91084b8f7ea4ed88b1a", "commit_rev":
"87bd2e631bfd8483e427f8a6efcb9fd858966953"}

[commit-bot: I haz the power, 2016-12-21 15:18:40]

Description was changed from

==========
[android] Use contextlib_ext.Optional for conditional context managers.

Scripts in //build/android have been using hand-rolled workarounds for
conditional context managers in the past. This switches them to a new
implementation I added to catapult in
https://codereview.chromium.org/2585763004/
==========

to

==========
[android] Use contextlib_ext.Optional for conditional context managers.

Scripts in //build/android have been using hand-rolled workarounds for
conditional context managers in the past. This switches them to a new
implementation I added to catapult in
https://codereview.chromium.org/2585763004/

Review-Url: https://codereview.chromium.org/2593903002
==========

[commit-bot: I haz the power, 2016-12-21 15:18:41]

Committed patchset #2 (id:20001)

[commit-bot: I haz the power, 2016-12-21 15:23:07]

Description was changed from

==========
[android] Use contextlib_ext.Optional for conditional context managers.

Scripts in //build/android have been using hand-rolled workarounds for
conditional context managers in the past. This switches them to a new
implementation I added to catapult in
https://codereview.chromium.org/2585763004/

Review-Url: https://codereview.chromium.org/2593903002
==========

to

==========
[android] Use contextlib_ext.Optional for conditional context managers.

Scripts in //build/android have been using hand-rolled workarounds for
conditional context managers in the past. This switches them to a new
implementation I added to catapult in
https://codereview.chromium.org/2585763004/

Committed: https://crrev.com/8bfc633a1029b75e665fefe7d01a7b41102212e4
Cr-Commit-Position: refs/heads/master@{#440103}
==========

[commit-bot: I haz the power, 2016-12-21 15:23:08]

Patchset 2 (id:??) landed as
https://crrev.com/8bfc633a1029b75e665fefe7d01a7b41102212e4
Cr-Commit-Position: refs/heads/master@{#440103}

[rnephew (Reviews Here), 2016-12-21 16:00:56]

Oh look, a comment I forgot to submit with the lgtm message.

https://codereview.chromium.org/2593903002/diff/1/build/android/pylib/__init_...
File build/android/pylib/__init__.py (right):

https://codereview.chromium.org/2593903002/diff/1/build/android/pylib/__init_...
build/android/pylib/__init__.py:8: _CATAPULT_PATH =
os.path.abspath(os.path.join(
I'm guessing this will hit some merge conflicts with my CL that just landed, so
you'll need to rebase.