Commit Graph

81 Commits

Author SHA1 Message Date
Eric Boren
8f553a769b [infra] Fix RecreateSKPs after assets update
Change-Id: I13ae7034cda4291743f433406ee2e8267dd48d3e
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/416576
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Ravi Mistry <rmistry@google.com>
2021-07-19 14:13:09 +00:00
Eric Boren
3177f853ea [infra] Fix fetch-sk and fetch-skps
Change-Id: I4b6a31e299eaabd4fdbb469272c3a9fd243a293e
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/419776
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
2021-06-18 15:20:38 +00:00
Eric Boren
64c848b384 [infra] Delete bin/try* and tools/chrome_release_branch*
These have been replaced by `sk try` and `sk release-branch`,
respectively.

Change-Id: Idc297dd7c84a87a09f69f310de495f91fcce36b9
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/409898
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Ravi Mistry <rmistry@google.com>
2021-05-27 14:27:20 +00:00
Eric Boren
015069cb04 [infra] Add bin/fetch-sk
Downloads the version of 'sk' indicated in DEPS.  Tracks the version ID
and sha256 sum of the downloaded executable to ensure that the correct
version is obtained.

Change-Id: I8d54f9e0159141b3582f2d08b9f1e397bfc60e7c
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/411776
Reviewed-by: Ravi Mistry <rmistry@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
2021-05-24 17:42:17 +00:00
Ravi Mistry
e5be65e998 Update references to master branch
Change-Id: I1bfd1b655af6cdfbd64452b1e594a276425095fe
Bug: skia:11987
Docs-Preview: https://skia.org/?cl=410790
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/410790
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Ravi Mistry <rmistry@google.com>
2021-05-21 15:18:16 +00:00
Eric Boren
a1db799824 Fix Python3 compatibility
Bug: skia:11768
Change-Id: I6107362457dce380e3fb1647ad58d8e33e453e2d
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/388743
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Ravi Mistry <rmistry@google.com>
2021-03-25 14:15:35 +00:00
Mike Klein
7de307a64f pull arm64 binary on arm64 Mac/Linux
Really I just want the Mac binary, but Linux kind of comes along for
free.  (It'd work for Windows too if there were arm64 GN binaries.)

Python2 calls Linux 'linux2', while Python3 calls it 'linux'.

Change-Id: I8ef3d482a956acfe6b1eec3d7b5429b25c528c54
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/354556
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
2021-01-15 19:00:46 +00:00
Mike Klein
4f4c064d5b roll gn to latest
Nice periodically, and this version also has a Mac arm64 binary.

Refine a few visibility rules from ":*" (any target in this file)
to "./*" (any target in any .gn file anywhere under this directory).

Use frameworks over libs where now required.

Change-Id: Ic19e1533e2810d18ae4684645d8555b422320b7f
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/354536
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
2021-01-15 15:34:00 +00:00
Eric Boren
d7e55629a0 bin/try: automatically set 'git cl issue' when not found
This eases the workflow for developers who don't use git-cl to upload
changes, but it doesn't remove the dependency on git-cl for triggering
try jobs. Doing so would require using the Buildbucket API directly,
which we're not well set up to do in Python. Eventually we'll be forced
to either migrate this tool to Python 3 or rewrite in Go, and at that
point we can use the API clients we already use from Go code to remove
the dependency on Depot Tools.

Change-Id: I749007a2150cfeb2442643db6f2a01a7a56c10a4
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/298748
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
2020-06-25 17:44:01 +00:00
John Stiles
3890d3d765 Roll gn.
Change-Id: I44eab9976aa4820a74f9246f1244c1a293e1fff6
Bug: gn:175, gn:158
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/297463
Commit-Queue: John Stiles <johnstiles@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
Auto-Submit: John Stiles <johnstiles@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
2020-06-18 19:33:04 +00:00
John Stiles
952dd05220 Revert "roll GN"
This reverts commit 81ec426d6e.

Reason for revert: breaks Xcode

Change-Id: Ib4dec91ae19e6b0ce242fa543cf7bcdf306c0220
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/297022
Reviewed-by: John Stiles <johnstiles@google.com>
Commit-Queue: John Stiles <johnstiles@google.com>
2020-06-17 16:00:54 +00:00
Mike Klein
81ec426d6e roll GN
up to https://gn-review.googlesource.com/c/gn/+/8920

Change-Id: Ibf69abea267f092fe1bcfed3b7c02a8935223e36
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/296705
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
2020-06-16 13:34:50 +00:00
Mike Klein
bfc09267bd roll GN
Update fetch-gn to fetch gn CIPD packages.
The hashing seemed unimportant... we could add it back.

Change-Id: I56be8a62d11be20100be41e0889d2088baefbcf0
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/280707
Commit-Queue: Jim Van Verth <jvanverth@google.com>
Auto-Submit: Mike Klein <mtklein@google.com>
Reviewed-by: Jim Van Verth <jvanverth@google.com>
2020-04-01 17:02:23 +00:00
Eric Boren
7ef10b66ec [infra] Fix bin/try
Left out an important bit...

Change-Id: I7b8707091bfdfddce8ad0fe82b6c88223b3defd8
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/264301
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
2020-01-14 12:05:56 +00:00
Eric Boren
86e50feaad [infra] Make bin/try work in any (Skia) repo
Find tasks.json of the current repo, rather than assuming skia.git. This
allows us to put bin/try in PATH and use it, for example, in the infra
repo.

Change-Id: I573820e893f8af192b427a02b2a4b04f359402b6
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/264058
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Ravi Mistry <rmistry@google.com>
2020-01-14 11:56:37 +00:00
Hal Canary
70a4fd2dfa tools/git-sync-deps works with either python
Bug: skia:9079
Change-Id: Id172efad6bbfaeb1d1f6bc00bcda622588f0a924
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/263355
Reviewed-by: Joe Gregorio <jcgregorio@google.com>
Commit-Queue: Joe Gregorio <jcgregorio@google.com>
Auto-Submit: Hal Canary <halcanary@google.com>
2020-01-10 16:30:11 +00:00
Eric Boren
1c8b26762b [infra] Fix bin/try
Chromium trybots are no longer listed in update_meta_config.py (they
were out of date anyway) so we can't import them here.

Also, fix the Buildbucket namespace warning.

Change-Id: I56fdc0f0629c43a9d180af11a88352bdc29e8314
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/254802
Reviewed-by: Ravi Mistry <rmistry@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
2019-11-15 19:44:04 +00:00
Mike Klein
3375a88482 roll GN
This rolls GN to the last point that Chromium was still using Google
Storage to pull GN, like we still are.  These are builds uploaded circa
November 2018, which is ~6 months newer than the GN we have been using.

Change-Id: I6a11733756f6e4c25fd4ca624fb74a2908518d02
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/244672
Commit-Queue: Brian Osman <brianosman@google.com>
Auto-Submit: Mike Klein <mtklein@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
2019-09-26 20:34:17 +00:00
Ravi Mistry
5fc8912087 Add bin/try-clients to trigger client tryjobs
Will trigger the following:
  skia.primary:
    Build-Debian9-Clang-arm-Release-Flutter_Android
    Build-Debian9-Clang-cf_x86_phone-eng-Android_Framework
    Build-Debian9-Clang-host-sdk-Android_Framework
    Build-Debian9-Clang-TAP-Presubmit-G3_Framework
  luci.chromium.try:
    mac_chromium_compile_dbg_ng

Bug: skia:9154
Change-Id: I88a21865777f7da52e8333920ad9d10da5e788ec
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/219482
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Ravi Mistry <rmistry@google.com>
2019-06-11 16:55:53 +00:00
Hal Canary
ba1602896d SkQP: new docker test code
`tools/skqp/docker_run_apk.sh` executes SkQP tests in an emulator

`tools/skqp/run_apk.sh` is used by `docker_run_apk.sh` and
`tools/skqp/test_apk.sh` to factor out common code.

Also: `bin/sysopen` now pipes output to `/dev/null` and doesn't block.

TODO: harmonize with test code executed by bots in `infra/skqp/`.

No-Try: true
Change-Id: Ia212a84565ff52279a845e20372a0ad7cc0726a4
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/209401
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
2019-04-19 18:50:03 +00:00
Hal Canary
8c2ccf4764 tools: bin/sync just alias for git-sync-deps now
No-Try: true
Change-Id: Id323d99c4ad0526980330daf41752452e6b09c95
Reviewed-on: https://skia-review.googlesource.com/c/194381
Auto-Submit: Hal Canary <halcanary@google.com>
Commit-Queue: Kevin Lubick <kjlubick@google.com>
Reviewed-by: Kevin Lubick <kjlubick@google.com>
2019-02-22 20:05:05 +00:00
Hal Canary
b45d512481 bin/sysopen: script moved to bin
No-Try: true
Change-Id: I1b9b1be36c9ed2d574de681b90b98e56f45e70fa
Reviewed-on: https://skia-review.googlesource.com/c/174588
Auto-Submit: Hal Canary <halcanary@google.com>
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
2018-12-06 14:21:33 +00:00
Hal Canary
ed18c93d1e bin/gerrit-number (no longer experimental)
Change-Id: Iadbef27074201173be2c71447c5d6f721afffbb3
Reviewed-on: https://skia-review.googlesource.com/c/174585
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
2018-12-05 16:47:29 +00:00
Brian Salomon
4db65d4d39 Add script to pull svgs to svgs/ and add to .gitignore
Change-Id: I77f78e7b27963a087ace30b8ce41118dd76c9026
Reviewed-on: https://skia-review.googlesource.com/150914
Reviewed-by: Hal Canary <halcanary@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Brian Salomon <bsalomon@google.com>
2018-08-31 20:02:24 +00:00
Hal Canary
9db44ed0ef bin/droid script: fix wierd mkdir error on my device
Here's the error:
    adb: error: failed to copy '...' to '...':
    remote secure_mkdirs failed: Operation not permitted

I also cleaned up the script.

No-Try: true
Change-Id: Ie2dec7b42eaf2a19475cdd0a04074f8bec47b2fb
Reviewed-on: https://skia-review.googlesource.com/148906
Auto-Submit: Hal Canary <halcanary@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
2018-08-23 14:46:19 +00:00
Mike Klein
25e2559656 add --sync to adb push in bin/droid
This skips pushing files that are already present.

Change-Id: Ibe86be1e553da3cbe9d02d00764164d9e0745f8d
Reviewed-on: https://skia-review.googlesource.com/138164
Commit-Queue: Mike Klein <mtklein@chromium.org>
Commit-Queue: Hal Canary <halcanary@google.com>
Auto-Submit: Mike Klein <mtklein@chromium.org>
Reviewed-by: Hal Canary <halcanary@google.com>
2018-06-28 15:46:57 +00:00
Ben Wagner
bb9cad053b Update gn
The currrent gn is quite old. The new gn, among other fixes, now supports
checking includes.

The values come from
893eb86b02

Change-Id: Ia2e47e18c7bbd3219a258fd6cc9063bf38588d00
Reviewed-on: https://skia-review.googlesource.com/129720
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
2018-05-23 12:11:06 +00:00
Mike Klein
cdcadf7a29 remove fetch-gn dependency on buildtools
This makes it possible to fetch GN without syncing DEPS.

To roll GN now, just update the three hashes in bin/fetch-gn.

buildtools is still a dependency of fetch-clang-format.

Bug: skia:7634

Change-Id: Ida6b516cfb0b306da73550875ab1ff97c9da6a64
Reviewed-on: https://skia-review.googlesource.com/107882
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
2018-02-21 20:42:26 +00:00
Hal Canary
ec97ac9be2 fetch-clang-format: better error checking
Change-Id: Idc0e984275056128301d4f1ae66aa6ace67b05d5
Reviewed-on: https://skia-review.googlesource.com/98322
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
2018-01-22 20:33:49 +00:00
Herbert Derby
ff889f1339 Add directions for when trouble strikes in fetch-skps.
Change-Id: I53c02c12a327f6484f4e45777c0168065adfae75
Reviewed-on: https://skia-review.googlesource.com/91080
Reviewed-by: Ravi Mistry <rmistry@google.com>
Commit-Queue: Herb Derby <herb@google.com>
2018-01-04 21:31:01 +00:00
Eric Boren
cbe99c050e bin/try: No prompt for a single matching job
NOTRY: true
Bug: skia:
Change-Id: I14e71f96b56b4288807bcc5189593b22d3078824
Reviewed-on: https://skia-review.googlesource.com/83443
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Ravi Mistry <rmistry@google.com>
2017-12-11 18:32:08 +00:00
Eric Boren
c9080c8846 bin/try: Add interactive mode
Bug: skia:
Change-Id: Iceb1834f1a3aa7594227ff3adf187c650aa30367
Reviewed-on: https://skia-review.googlesource.com/61480
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Ravi Mistry <rmistry@google.com>
2017-10-18 17:16:16 +00:00
Eric Boren
d5c128bd7e bin/try: add support for internal bots
Bug: skia:
Change-Id: Iae6b2dc1098c9763ceec0289129818e1948a974c
Reviewed-on: https://skia-review.googlesource.com/60543
Reviewed-by: Ravi Mistry <rmistry@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
2017-10-17 21:10:15 +00:00
Eric Boren
cff9f956c7 bin/try: Add support for select Chromium trybots
These are hard-coded in update_meta_config.py, which is used to set the
list of trybots in Gerrit.

Bug: skia:
Change-Id: I6e512e4cb59974e27e8954cf5134c70068e716f3
Reviewed-on: https://skia-review.googlesource.com/60521
Reviewed-by: Ravi Mistry <rmistry@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
2017-10-17 13:43:42 +00:00
Eric Boren
6376517472 Add bin/try script
Wrapper for "git cl try" which allows searching jobs using regular
expressions.

Bug: skia:
Change-Id: I07a1b487f2eca9da7df4c4d4c65e22e459b76fed
Reviewed-on: https://skia-review.googlesource.com/60261
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Reviewed-by: Ravi Mistry <rmistry@google.com>
2017-10-16 19:37:11 +00:00
Mike Klein
8e3c42b1ee add a Win/Clang build bot
BUG=skia:2679

CQ_INCLUDE_TRYBOTS=skia.primary:Build-Win-Clang-x86_64-Release

Change-Id: I861366ae1340abcc67e87041904d08337b465bbe
Reviewed-on: https://skia-review.googlesource.com/28864
Reviewed-by: Eric Boren <borenet@google.com>
2017-07-31 19:53:51 +00:00
Mike Klein
c722f79b6c clang on windows support
1) Run python bin/fetch-clang-win
2) Set clang_win = "../bin/clang_win"
3) ???
4) Profit

Most changes here are to pass the right -mfoo flags to Clang
to enable advanced instruction sets, or fixed warning-as-errors.

BUG=skia:2679

Change-Id: Ieed145d35c209131c7c16fdd3ee11a3de4a1a921
Reviewed-on: https://skia-review.googlesource.com/28740
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
2017-07-31 18:39:23 +00:00
Hal Canary
b357dea546 bin/fetch-clang-format
Change-Id: I7deb9b49b4a3a361888a6afc07b4c6341a4b16cf
Reviewed-on: https://skia-review.googlesource.com/9410
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Hal Canary <halcanary@google.com>
2017-03-08 16:43:49 +00:00
Kevin Lubick
0168e0442e Add a way to compute the code coverage of fuzzers
This also fixes bin/coverage.

fuzz/coverage borrows heavily from bin/coverage.
BUG=skia:

Change-Id: I9e353d1f5ea3bca1d57d66b1c1ecabc6f9b23cee
Reviewed-on: https://skia-review.googlesource.com/8414
Reviewed-by: Joe Gregorio <jcgregorio@google.com>
Commit-Queue: Kevin Lubick <kjlubick@google.com>
2017-02-15 13:19:40 +00:00
Mike Klein
160907f8de Clean up more references to GYP.
Delete files only used by GYP, and files that used GYP.  Neither can
possibly be actively used.  Beyond that, just a couple doc tweaks.

Change-Id: I0220d7226e7bb9ed7c54a7d8f2906a718313c521
Reviewed-on: https://skia-review.googlesource.com/8062
Commit-Queue: Mike Klein <mtklein@chromium.org>
Reviewed-by: Hal Canary <halcanary@google.com>
2017-02-06 17:55:35 +00:00
Hal Canary
cae159e760 bin/list-skia-bots
NOTRY=true
Change-Id: Ie123bf796ff062972fd86319f0a20f3a81a9b2ff
Reviewed-on: https://skia-review.googlesource.com/7982
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
2017-02-02 21:23:48 +00:00
Hal Canary
7f660e8418 bin/fetch-gn is 3.5x faster
Change-Id: I8098a38eb81efe0a73201c1f00dff8363b9c2075
Reviewed-on: https://skia-review.googlesource.com/7025
Commit-Queue: Hal Canary <halcanary@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>
2017-01-30 16:22:22 +00:00
Hal Canary
4d3adb6b0d bin/sync : call tools/git-sync-deps now
Also, update some docs.

NOTRY=true
Change-Id: I7ad3375fc1cbf8f71ed42a460ecfe29ef6c1d85e
Reviewed-on: https://skia-review.googlesource.com/7657
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
2017-01-27 16:03:35 +00:00
Mike Klein
b621a35b43 drop depot_tools dependency in bin/fetch-gn
... and copy gn to bin/ when done to make it easy to find.

Change-Id: I1ec405b4c45efb828626ff7d904a417f69b39cb2
Reviewed-on: https://skia-review.googlesource.com/6962
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
2017-01-12 19:54:50 +00:00
Hal Canary
a4a3381790 tools and docs: clean up gyp-specific things
BUG=skia:

DOCS_PREVIEW= https://skia.org/?cl=5770

Change-Id: Iadc436a68cbf7ec0d1dd3c019072eb28bf589bb6
Reviewed-on: https://skia-review.googlesource.com/5770
Commit-Queue: Hal Canary <halcanary@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>
2016-12-09 21:15:27 +00:00
Mike Klein
82364bae16 Build for Android from Windows, work in progress.
Pretty vanilla stuff here, mostly just making the gcc-like toolchain Windows friendly.

I was having trouble getting rm -r {{output}} && $ar rcs {{output}} @$rspfile to work without deleting my ar.exe, so I chickened out the usual way by adding gn/ar.py.

I've also updated bin/droid to work with Git Bash on Windows.

BUG=skia:

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=3751

Change-Id: I04c34ccc91e6a291c11ac4e7a7a0ffe41d879fe6
Reviewed-on: https://skia-review.googlesource.com/3751
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
2016-10-26 14:37:43 +00:00
Hal Canary
23510f2c29 bin/sync: call fetch-gn when DEPS changes
Change-Id: Ifb2a364df1a8817152a2c1e79748d14534a9e523
Reviewed-on: https://skia-review.googlesource.com/3904
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Hal Canary <halcanary@google.com>
2016-10-25 16:15:12 +00:00
halcanary
3948a1bf18 bin/coverage: a GN version of the coverage script
intended to replace tools/coverage when GYP is gone.

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2343243002

Review-Url: https://codereview.chromium.org/2343243002
2016-09-26 10:30:39 -07:00
egdaniel
c19440dcaf Update GN droid script
Splits the pushes into different lines since old adbs cannot handle the one
line command

TBR=mtklein@google.com

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2339293002

Review-Url: https://codereview.chromium.org/2339293002
2016-09-14 14:42:03 -07:00
mtklein
f3155ad97c GN: add a helper script for running Android builds
Think of this as the spiritual equivalent of platform_tools/android/bin/android_run_skia, but for GN and easier to type.

Cutting down the debug symbols makes Android builds about 1/4 the size.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2323833002
DOCS_PREVIEW= https://skia.org/user/quick/gn?cl=2323833002

Review-Url: https://codereview.chromium.org/2323833002
2016-09-08 10:03:21 -07:00