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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome_dll.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/browser/chrome_browser_main_extra_parts_aura.cc ('k') | chrome/chrome_exe.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_dll.gypi
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index 75c0164870667ddab4c9e01a0bd9619652f4bb7b..aa4ac071604057a13e7f94bbdd881c243d96182f 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -16,6 +16,15 @@
'app/policy/cloud_policy_codegen.gyp:policy',
],
'conditions': [
+ ['use_webkit_compositor==1', {
+ 'dependencies': [
+ '../ui/gfx/compositor/compositor.gyp:compositor',
+ ],
+ }, { # use_webkit_compositor!=1
+ 'dependencies': [
+ '../ui/gfx/compositor/compositor.gyp:test_compositor',
+ ],
+ }],
['OS=="win"', {
'product_name': 'chrome',
'dependencies': [
« no previous file with comments | « chrome/browser/chrome_browser_main_extra_parts_aura.cc ('k') | chrome/chrome_exe.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698