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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/gfx/gfx.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 | « no previous file | ui/ui.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/gfx.gyp
diff --git a/ui/gfx/gfx.gyp b/ui/gfx/gfx.gyp
index 02820a752ea250163dab4066407639ff772e22e8..66c384eb2787b8d85a352a28aa96ce5913c5223b 100644
--- a/ui/gfx/gfx.gyp
+++ b/ui/gfx/gfx.gyp
@@ -408,6 +408,11 @@
'path.cc',
],
}],
+ ['OS=="android" and use_aura==1', {
+ 'sources!': [
+ 'screen_android.cc',
+ ],
+ }],
['OS=="android" and android_webview_build==0', {
'dependencies': [
'<(DEPTH)/base/base.gyp:base_java',
« no previous file with comments | « no previous file | ui/ui.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698