diff options
| author | alokp@chromium.org <alokp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-17 17:12:51 +0000 |
|---|---|---|
| committer | alokp@chromium.org <alokp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-17 17:12:51 +0000 |
| commit | 83f7acefd605330f6091bdb2aeed657776b6b85d (patch) | |
| tree | 2e0c3e9d984bdce815344eebab0fe91ec63b192d /gpu/demos | |
| parent | 19f60a5a8d524ae49e0345b49000b5d526ebecf6 (diff) | |
| download | chromium_src-83f7acefd605330f6091bdb2aeed657776b6b85d.zip chromium_src-83f7acefd605330f6091bdb2aeed657776b6b85d.tar.gz chromium_src-83f7acefd605330f6091bdb2aeed657776b6b85d.tar.bz2 | |
Removed redundant conditionals from gpu/demos.gyp.
Review URL: http://codereview.chromium.org/601085
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39226 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/demos')
| -rw-r--r-- | gpu/demos/demos.gyp | 33 |
1 files changed, 13 insertions, 20 deletions
diff --git a/gpu/demos/demos.gyp b/gpu/demos/demos.gyp index 084c4d2..40fd7dc 100644 --- a/gpu/demos/demos.gyp +++ b/gpu/demos/demos.gyp @@ -18,9 +18,6 @@ }], ], }, - 'includes': [ - '../../build/common.gypi', - ], 'targets': [ { 'target_name': 'gpu_demo_framework', @@ -45,19 +42,15 @@ 'sources': [ 'framework/main_exe.cc', 'framework/window.cc', + 'framework/window_linux.cc', + 'framework/window_mac.mm', + 'framework/window_win.cc', 'framework/window.h', ], 'conditions': [ ['OS=="linux"', { - 'sources': ['framework/window_linux.cc'], 'dependencies': ['../../build/linux/system.gyp:gtk'], }], - ['OS=="mac"', { - 'sources': ['framework/window_mac.mm'], - }], - ['OS=="win"', { - 'sources': ['framework/window_win.cc'], - }], ], }, { @@ -75,22 +68,22 @@ 'sources': [ 'framework/main_pepper.cc', ], + 'run_as': { + 'action': [ + '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)chrome<(EXECUTABLE_SUFFIX)', + '--no-sandbox', + '--internal-pepper', + '--enable-gpu-plugin', + '--load-plugin=$(TargetPath)', + 'file://$(ProjectDir)pepper_gpu_demo.html', + ], + }, 'conditions': [ ['OS=="win"', { 'sources': [ 'framework/plugin.def', 'framework/plugin.rc', ], - 'run_as': { - 'action': [ - '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)chrome<(EXECUTABLE_SUFFIX)', - '--no-sandbox', - '--internal-pepper', - '--enable-gpu-plugin', - '--load-plugin=$(TargetPath)', - 'file://$(ProjectDir)pepper_gpu_demo.html', - ], - }, }], ['OS=="linux"', { # -gstabs, used in the official builds, causes an ICE. Remove it. |