diff options
author | alokp@chromium.org <alokp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-14 14:28:54 +0000 |
---|---|---|
committer | alokp@chromium.org <alokp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-14 14:28:54 +0000 |
commit | 8d9518551a5ba45d32991a8cb0a1c9de017caea9 (patch) | |
tree | 9004eca257f6d2bdee8c1172fdce8819dd4f7992 /build/all.gyp | |
parent | c378cca3b4c7f2c48184283f3ab2ac5818233037 (diff) | |
download | chromium_src-8d9518551a5ba45d32991a8cb0a1c9de017caea9.zip chromium_src-8d9518551a5ba45d32991a8cb0a1c9de017caea9.tar.gz chromium_src-8d9518551a5ba45d32991a8cb0a1c9de017caea9.tar.bz2 |
Moved demos.gyp from windows dependency to all platforms. Excluded gpu_demo_framework_pepper from being included with wildcard demos.gyp:*.
Review URL: http://codereview.chromium.org/2038015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47270 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/all.gyp')
-rw-r--r-- | build/all.gyp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build/all.gyp b/build/all.gyp index d98a16c..5a5bac0 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -15,6 +15,7 @@ '../chrome/chrome.gyp:*', '../gfx/gfx.gyp:*', '../gpu/gpu.gyp:*', + '../gpu/demos/demos.gyp:*', '../ipc/ipc.gyp:*', '../media/media.gyp:*', '../net/net.gyp:*', @@ -97,7 +98,6 @@ '../chrome_frame/chrome_frame.gyp:*', '../courgette/courgette.gyp:*', '../gears/gears.gyp:*', - '../gpu/demos/demos.gyp:*', '../rlz/rlz.gyp:*', '../sandbox/sandbox.gyp:*', '../third_party/bsdiff/bsdiff.gyp:*', |