summaryrefslogtreecommitdiffstats
path: root/gpu/demos
diff options
context:
space:
mode:
authoralokp@chromium.org <alokp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-14 14:28:54 +0000
committeralokp@chromium.org <alokp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-14 14:28:54 +0000
commit8d9518551a5ba45d32991a8cb0a1c9de017caea9 (patch)
tree9004eca257f6d2bdee8c1172fdce8819dd4f7992 /gpu/demos
parentc378cca3b4c7f2c48184283f3ab2ac5818233037 (diff)
downloadchromium_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 'gpu/demos')
-rw-r--r--gpu/demos/demos.gyp5
1 files changed, 5 insertions, 0 deletions
diff --git a/gpu/demos/demos.gyp b/gpu/demos/demos.gyp
index bd2c5f7..a7ba2b9 100644
--- a/gpu/demos/demos.gyp
+++ b/gpu/demos/demos.gyp
@@ -56,6 +56,11 @@
{
'target_name': 'gpu_demo_framework_pepper',
'type': 'static_library',
+ # This target injects a bunch of source files to direct dependents.
+ # If the dependent is a none-type target (like all.gyp), gyp will
+ # generate error due to these injected source files. Workaround this
+ # problem by preventing it from being selected by demos.gyp:*.
+ 'suppress_wildcard': 1,
'dependencies': [
'gpu_demo_framework',
'../gpu.gyp:pgl',