Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9166)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome_tests.gypi

Issue 8890050: Attempt 3 at: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Da fix Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/chrome_exe.gypi ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index c329517023773200f1d054c0a8df87a95538314c..6f616384f04976531bd89f22904f28822af0833b 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -65,7 +65,6 @@
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
'../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
- '../ui/gfx/compositor/compositor.gyp:test_compositor',
'../ui/gfx/compositor/compositor.gyp:compositor_test_support',
],
'export_dependent_settings': [
@@ -279,6 +278,11 @@
['exclude', 'test/base/ui_test_utils_win.cc'],
],
}],
+ ['use_webkit_compositor==0', {
+ 'dependencies': [
+ '../ui/gfx/compositor/compositor.gyp:test_compositor',
+ ],
+ }],
],
},
{
« no previous file with comments | « chrome/chrome_exe.gypi ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698