diff options
| author |  mtklein <mtklein@chromium.org> | 2014-10-31 06:38:24 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-10-31 06:38:25 -0700 |
| commit | 2100c5ed7a5e5470a04e7af7309d8bd3fc4249f7 (patch) | |
| tree | aaaaa5ac4c540c6d7f5bc26e88c850d18c0fb7ca /gyp | |
| parent | d8aa7b74c8ef0cb8ed3f6b03beb7ee5013624372 (diff) | |
Turn SkTaskGroups back on.
Revert "Disable SkTaskGroup in SkMultiPictureDraw temporarily."
Revert "Revert harder, removing SkTaskGroup.cpp from core temporarily."
NOTREECHECKS=true
BUG=skia:
Review URL: https://codereview.chromium.org/687263007
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/SampleApp.gyp | 1 | ||||
| -rw-r--r-- | gyp/core.gypi | 4 | ||||
| -rw-r--r-- | gyp/dm.gypi | 1 | ||||
| -rwxr-xr-x | gyp/pathops_skpclip.gyp | 1 | ||||
| -rw-r--r-- | gyp/pathops_unittest.gyp | 1 | ||||
| -rw-r--r-- | gyp/tools.gyp | 1 |
6 files changed, 2 insertions, 7 deletions
diff --git a/gyp/SampleApp.gyp b/gyp/SampleApp.gyp index e2a6737151..6f39f711c3 100644 --- a/gyp/SampleApp.gyp +++ b/gyp/SampleApp.gyp @@ -24,7 +24,6 @@ 'gmslides.gypi', ], 'sources': [ - '../src/core/SkTaskGroup.cpp', '../gm/gm.cpp', '../samplecode/GMSampleView.h', '../samplecode/ClockFaceView.cpp', diff --git a/gyp/core.gypi b/gyp/core.gypi index c1c3b63fa5..39454b6539 100644 --- a/gyp/core.gypi +++ b/gyp/core.gypi @@ -188,8 +188,8 @@ '<(skia_src_path)/core/SkStrokeRec.cpp', '<(skia_src_path)/core/SkStrokerPriv.cpp', '<(skia_src_path)/core/SkStrokerPriv.h', - #'<(skia_src_path)/core/SkTaskGroup.cpp', - #'<(skia_src_path)/core/SkTaskGroup.h', + '<(skia_src_path)/core/SkTaskGroup.cpp', + '<(skia_src_path)/core/SkTaskGroup.h', '<(skia_src_path)/core/SkTextBlob.cpp', '<(skia_src_path)/core/SkTextFormatParams.h', '<(skia_src_path)/core/SkTextMapStateProc.h', diff --git a/gyp/dm.gypi b/gyp/dm.gypi index 8d4bf7311b..932f430dad 100644 --- a/gyp/dm.gypi +++ b/gyp/dm.gypi @@ -28,7 +28,6 @@ 'tests.gypi', ], 'sources': [ - '../src/core/SkTaskGroup.cpp', '../dm/DM.cpp', '../dm/DMCpuGMTask.cpp', '../dm/DMGpuGMTask.cpp', diff --git a/gyp/pathops_skpclip.gyp b/gyp/pathops_skpclip.gyp index 721845fca8..4dadd7942e 100755 --- a/gyp/pathops_skpclip.gyp +++ b/gyp/pathops_skpclip.gyp @@ -22,7 +22,6 @@ 'tools.gyp:resources', ], 'sources': [ - '../src/core/SkTaskGroup.cpp', '../tests/PathOpsDebug.cpp', '../tests/PathOpsSkpClipTest.cpp', ], diff --git a/gyp/pathops_unittest.gyp b/gyp/pathops_unittest.gyp index 70c44782da..c8732545f2 100644 --- a/gyp/pathops_unittest.gyp +++ b/gyp/pathops_unittest.gyp @@ -15,7 +15,6 @@ 'tools.gyp:crash_handler', ], 'sources': [ - '../src/core/SkTaskGroup.cpp', '../tests/PathOpsAngleIdeas.cpp', '../tests/PathOpsBattles.cpp', '../tests/PathOpsCubicLineIntersectionIdeas.cpp', diff --git a/gyp/tools.gyp b/gyp/tools.gyp index 40eed20b2e..dae1cf58c7 100644 --- a/gyp/tools.gyp +++ b/gyp/tools.gyp @@ -160,7 +160,6 @@ 'target_name': 'skpdiff', 'type': 'executable', 'sources': [ - '../src/core/SkTaskGroup.cpp', '../tools/skpdiff/skpdiff_main.cpp', '../tools/skpdiff/SkDiffContext.cpp', '../tools/skpdiff/SkImageDiffer.cpp', |