diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-10 21:46:02 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-10 21:46:02 +0000 |
| commit | f1a36c3d39cbdc2e0884453cd82c64d9ced6f447 (patch) | |
| tree | f5e1416685049b3e3d6e4a2f4cc785d44bc3d1ed /media/media.gyp | |
| parent | 4f788fd1f7be51c4f793d842f9557a50690cba53 (diff) | |
| download | chromium_src-f1a36c3d39cbdc2e0884453cd82c64d9ced6f447.zip chromium_src-f1a36c3d39cbdc2e0884453cd82c64d9ced6f447.tar.gz chromium_src-f1a36c3d39cbdc2e0884453cd82c64d9ced6f447.tar.bz2 | |
Don't build shader_bench for Aura builds since it breaks all the win_aura trybots (gfx::NativeWindow != HWND).
Review URL: https://codereview.chromium.org/11086055
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161200 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/media.gyp')
| -rw-r--r-- | media/media.gyp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/media.gyp b/media/media.gyp index 3168c33..0d890f1 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -1036,7 +1036,7 @@ }, ], }], - ['OS == "win" or toolkit_uses_gtk == 1', { + ['(OS == "win" or toolkit_uses_gtk == 1) and use_aura != 1', { 'targets': [ { 'target_name': 'shader_bench', |