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

Unified Diff: ui/ui.gyp

Issue 102163005: Do not define use_clipboard_aurax11 on ozone builds (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 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 | « build/common.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ui.gyp
diff --git a/ui/ui.gyp b/ui/ui.gyp
index 92d05c36383817d6ac5e6f70e5ffe973a3982f98..3f2ebe510fa7a7ddafe5cf250248e2f6a658ec41 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -425,7 +425,7 @@
'../build/linux/system.gyp:pangocairo',
],
}],
- ['use_x11==0 or use_clipboard_aurax11==1', {
+ ['(use_x11==0 or use_clipboard_aurax11==1) and use_ozone==0', {
sky 2013/12/13 17:49:10 Shouldn't the test for use_clipboard_aurax11==1 be
oshima 2013/12/13 17:51:35 This may look a bit weird, but this is side effect
sky 2013/12/13 17:55:31 Shouldn't the test then be os==win and use_aura or
oshima 2013/12/13 18:03:43 If you ask my preference, I prefer not to include
'sources!': [
'base/clipboard/clipboard_aura.cc',
],
« no previous file with comments | « build/common.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698