commit d9c4dfb170a484f309b501115fd06d0e7135d0fd
author commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Jan 08 16:52:42 2014 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Jan 08 16:52:42 2014 +0000
tree 01d70cfc088c0d4681c2d4e92656fa47c87b605d
parent fa8afda2500f4c90b52bb18228033abb651bde2d

Move DM from everything to most, to build it by default.

BUG=
R=reed@google.com

Author: mtklein@google.com

Review URL: https://codereview.chromium.org/127423003

git-svn-id: http://skia.googlecode.com/svn/trunk@12962 2bbb7eff-a529-9590-31e7-b0007b416f81

gyp/everything.gyp

diff --git a/gyp/everything.gyp b/gyp/everything.gyp
index 5d1697e..bf67d1f 100644
--- a/gyp/everything.gyp
+++ b/gyp/everything.gyp
@@ -25,10 +25,6 @@
             #'v8.gyp:SkV8Example',
             ],
         }],
-        # DM assumes you've got a GPU.
-        ['skia_gpu == 1', {
-          'dependencies': [ 'dm.gyp:dm' ],
-        }],
       ],
     },
   ],

gyp/most.gyp

diff --git a/gyp/most.gyp b/gyp/most.gyp
index 704b230..b914bc5 100644
--- a/gyp/most.gyp
+++ b/gyp/most.gyp
@@ -25,6 +25,10 @@
         ['skia_os == "android"', {
           'dependencies': [ 'android_system.gyp:SampleApp_APK' ],
         }],
+        # DM assumes you've got a GPU.
+        ['skia_gpu == 1', {
+          'dependencies': [ 'dm.gyp:dm' ],
+        }],
       ],
     },
   ],