diff options
| author |  ethannicholas <ethannicholas@google.com> | 2016-02-10 05:40:46 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-02-10 05:40:46 -0800 |
| commit | 50a8dd0a00538840e55233146cb202e256cc6c34 (patch) | |
| tree | 438fe35251e3e22c94b593ce6fd69917e7b1b8f0 /gyp | |
| parent | d116561ddcca3f961b30cd9e485d81b654bc10ec (diff) | |
Moved Canvas->JSON and JSON->Canvas functionality into SkDebugCanvas.
SkJSONCanvas and SkJSONRenderer will be deleted once the debug server
has been updated.
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1681643002
Committed: https://skia.googlesource.com/skia/+/32fff1ba0c759d97ab78320b7ae46dd7696a4e6e
Committed: https://skia.googlesource.com/skia/+/46cb6d6b82b0ab71033aef91419e8beae25bb8a4
Review URL: https://codereview.chromium.org/1681643002
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/SampleApp.gyp | 1 | ||||
| -rw-r--r-- | gyp/debugger.gyp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/gyp/SampleApp.gyp b/gyp/SampleApp.gyp index bb48affe9a..c22eaa207e 100644 --- a/gyp/SampleApp.gyp +++ b/gyp/SampleApp.gyp @@ -157,6 +157,7 @@ 'views.gyp:views', 'views_animated.gyp:views_animated', 'xml.gyp:xml', + 'jsoncpp.gyp:jsoncpp', ], 'msvs_settings': { 'VCLinkerTool': { diff --git a/gyp/debugger.gyp b/gyp/debugger.gyp index e7e8275125..c86538dcbd 100644 --- a/gyp/debugger.gyp +++ b/gyp/debugger.gyp @@ -136,6 +136,7 @@ 'dependencies': [ 'debugger_qt_mocs', 'skia_lib.gyp:skia_lib', + 'jsoncpp.gyp:jsoncpp', ], 'cflags': [ # Clang gets confused by QWeakPointer, see http://llvm.org/bugs/show_bug.cgi?id=13127 |