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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/ui.gyp

Issue 134043003: Removes a couple of conflicting files from build (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 months 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 | « ui/gfx/gfx.gyp ('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 d8129c46d5fda2482060b4e6b96ec7703da64dc7..5aa53e3fa0506e47707a53e60cfe4e0d64627a6a 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -592,6 +592,11 @@
'base/cursor/cursor_android.cc'
],
}],
+ ['OS=="android" and use_aura==1', {
+ 'sources!': [
+ 'base/clipboard/clipboard_aura.cc'
+ ],
+ }],
['OS=="android" or OS=="ios"', {
'sources!': [
'base/device_form_factor_desktop.cc'
« no previous file with comments | « ui/gfx/gfx.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698