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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome_exe.gypi

Issue 8889022: Attempt 2 at : Makes tests either use mock compositor or mock (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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_dll.gypi ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_exe.gypi
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi
index 4f7edcc9c6990496dd7b85d52345c0db330ac02d..d2f220666bd52d02cf8bcb5507c3a3335f155acb 100644
--- a/chrome/chrome_exe.gypi
+++ b/chrome/chrome_exe.gypi
@@ -42,6 +42,11 @@
'INFOPLIST_FILE': 'app/app-Info.plist',
},
'conditions': [
+ ['use_aura==1 and use_webkit_compositor==0', {
+ 'dependencies': [
+ '../ui/gfx/compositor/compositor.gyp:test_compositor',
+ ],
+ }],
['OS == "android"', {
# Don't put the 'chrome' target in 'all' on android
'suppress_wildcard': 1,
« no previous file with comments | « chrome/chrome_dll.gypi ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698