diff options
| author |  robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-09-18 13:28:10 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-09-18 13:28:10 +0000 |
| commit | 35349d80b3564123fffd7bf75fc6069c314dcfc1 (patch) | |
| tree | b9b037c113ff7b1094ef7f3ab96fa74d5ccf99fe /gyp | |
| parent | 15ec2ea61712f62e955ee5f5a1878dc55e11583f (diff) | |
Revert r11342 (Add infrastructure for testing the debugger code) due to build breakages
git-svn-id: http://skia.googlecode.com/svn/trunk@11343 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/debugger.gyp | 25 | ||||
| -rw-r--r-- | gyp/tests.gyp | 2 |
2 files changed, 6 insertions, 21 deletions
diff --git a/gyp/debugger.gyp b/gyp/debugger.gyp index f15d435b3f..3a972c277f 100644 --- a/gyp/debugger.gyp +++ b/gyp/debugger.gyp @@ -87,9 +87,14 @@ ], 'sources': [ '../debugger/SkDebugger.cpp', + '../src/utils/debugger/SkDebugCanvas.h', + '../src/utils/debugger/SkDebugCanvas.cpp', + '../src/utils/debugger/SkDrawCommand.h', + '../src/utils/debugger/SkDrawCommand.cpp', + '../src/utils/debugger/SkObjectParser.h', + '../src/utils/debugger/SkObjectParser.cpp', ], 'dependencies': [ - 'debugger_lib', 'skia_lib.gyp:skia_lib', 'bench.gyp:bench_timer', 'tools.gyp:picture_renderer', @@ -149,24 +154,6 @@ }], ], }, - { - 'target_name': 'debugger_lib', - 'type': 'static_library', - 'include_dirs' : [ - '../src/core', - ], - 'dependencies': [ - 'skia_lib.gyp:skia_lib', - ], - 'sources': [ - '../src/utils/debugger/SkDebugCanvas.h', - '../src/utils/debugger/SkDebugCanvas.cpp', - '../src/utils/debugger/SkDrawCommand.h', - '../src/utils/debugger/SkDrawCommand.cpp', - '../src/utils/debugger/SkObjectParser.h', - '../src/utils/debugger/SkObjectParser.cpp', - ] - }, ], 'conditions': [ [ 'skia_os != "nacl"', { diff --git a/gyp/tests.gyp b/gyp/tests.gyp index ece65eb49e..227f644537 100644 --- a/gyp/tests.gyp +++ b/gyp/tests.gyp @@ -44,7 +44,6 @@ '../tests/ColorFilterTest.cpp', '../tests/ColorTest.cpp', '../tests/DataRefTest.cpp', - '../tests/DebugCanvasTest.cpp', '../tests/DeferredCanvasTest.cpp', '../tests/DequeTest.cpp', '../tests/DeviceLooperTest.cpp', @@ -146,7 +145,6 @@ 'experimental.gyp:experimental', 'pdf.gyp:pdf', 'tools.gyp:picture_utils', - 'debugger.gyp:debugger_lib', ], 'conditions': [ [ 'skia_gpu == 1', { |