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

Unified Diff: content/content_common.gypi

Issue 8676009: fix content build on !linux && use_x11 (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 9 years, 1 month 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
diff --git a/content/content_common.gypi b/content/content_common.gypi
index 94716890cce735386ed295f379b68013ad184234..57d2d07e33a345339641ad286e0861be130e7e8b 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -294,14 +294,6 @@
'dependencies': [
'../build/linux/system.gyp:pangocairo',
],
- }],
- ['use_x11 == 1 and target_arch != "arm"', {
- 'sources': [
- 'common/gpu/x_util.cc',
- 'common/gpu/x_util.h',
- ],
- }],
- ['OS=="linux"', {
'include_dirs': [
'<(DEPTH)/third_party/angle/include',
],
@@ -311,6 +303,12 @@
],
},
}],
+ ['use_x11 == 1 and target_arch != "arm"', {
+ 'sources': [
+ 'common/gpu/x_util.cc',
+ 'common/gpu/x_util.h',
+ ],
+ }],
['enable_gpu==1', {
'dependencies': [
'../gpu/gpu.gyp:command_buffer_service',
« 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