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

Unified Diff: content/content_common.gypi

Issue 8776009: Chrome for arm seems to make the implicit assumption that (Closed) Base URL: http://src.chromium.org/svn/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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_common.gypi
===================================================================
--- content/content_common.gypi (revision 114016)
+++ content/content_common.gypi (working copy)
@@ -292,7 +292,7 @@
],
},
}],
- ['use_x11 == 1 and target_arch != "arm"', {
+ ['use_x11 == 1 and (target_arch != "arm" or chromeos == 0)', {
'sources': [
'common/gpu/x_util.cc',
'common/gpu/x_util.h',
@@ -303,7 +303,7 @@
'../gpu/gpu.gyp:command_buffer_service',
],
}],
- ['target_arch=="arm"', {
+ ['target_arch=="arm" and chromeos == 1', {
'dependencies': [
'../media/media.gyp:media',
],
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698