diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-03-26 21:26:15 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-03-26 21:26:15 +0000 |
| commit | 787227d3560bd8021394b76ada2cb184ecf5c919 (patch) | |
| tree | e5986fc1e4025a3514a52fa83421f17793be48d3 /gyp | |
| parent | a54abdccbd9e9b8917f7c7b0af5d9fe39d879a9a (diff) | |
Let DM work without a GPU.
Testing:
/m/s/skia (dm) $ d dm; and env GYP_DEFINES=skia_gpu=0 d dm
ninja: Entering directory `out/Debug'
ninja: no work to do.
(294 GMs, 620 benches) x 4 configs, 245 tests
4507 tasks leftUnsupported vertex-color/texture xfer mode.
Unsupported vertex-color/texture xfer mode.
0 tasks left
416.53user 9.86system 0:47.43elapsed 898%CPU (0avgtext+0avgdata
13353376maxresident)k
0inputs+0outputs (0major+3579906minor)pagefaults 0swaps
ninja: Entering directory `out/Debug'
[909/909] LINK dm
(287 GMs, 612 benches) x 4 configs, 227 tests
0 tasks left
365.24user 7.71system 0:14.55elapsed 2562%CPU (0avgtext+0avgdata
14718912maxresident)k
0inputs+0outputs (0major+3328269minor)pagefaults 0swaps
BUG=skia:
R=bsalomon@google.com, mtklein@google.com
Author: mtklein@chromium.org
Review URL: https://codereview.chromium.org/213093004
git-svn-id: http://skia.googlecode.com/svn/trunk@13960 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/most.gyp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/gyp/most.gyp b/gyp/most.gyp index 7c32941676..3d9bad45ca 100644 --- a/gyp/most.gyp +++ b/gyp/most.gyp @@ -23,15 +23,12 @@ 'pathops_unittest.gyp:*', 'skpskgr_test.gyp:*', # 'pdfviewer.gyp:pdfviewer', + 'dm.gyp:dm', ], 'conditions': [ ['skia_os == "android"', { 'dependencies': [ 'android_system.gyp:SampleApp_APK' ], }], - # DM assumes you've got a GPU. - ['skia_gpu == 1', { - 'dependencies': [ 'dm.gyp:dm' ], - }], [ 'skia_skip_gui', { 'dependencies!': [ |