diff options
| -rw-r--r-- | app/app.gyp | 3 | ||||
| -rw-r--r-- | base/base.gyp | 1 | ||||
| -rw-r--r-- | chrome/chrome.gyp | 16 |
3 files changed, 17 insertions, 3 deletions
diff --git a/app/app.gyp b/app/app.gyp index 4149e4c..449b9bb 100644 --- a/app/app.gyp +++ b/app/app.gyp @@ -216,10 +216,9 @@ ], 'conditions': [ ['OS=="linux"', { - # TODO: Move these dependencies to platform-neutral once these - # projects are generated by GYP. 'dependencies': [ '../build/linux/system.gyp:gtk', + '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', ], }], ['OS!="win"', { diff --git a/base/base.gyp b/base/base.gyp index 0db3328..c35f8fa 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -696,6 +696,7 @@ 'dependencies': [ '../build/linux/system.gyp:gtk', '../build/linux/system.gyp:nss', + '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', ], }, { # OS != "linux" and OS != "freebsd" 'sources!': [ diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index fb4f905..7e62012 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -3806,6 +3806,11 @@ 'test/automated_ui_tests/automated_ui_tests.h', ], 'conditions': [ + ['OS=="linux"', { + 'dependencies': [ + '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', + ], + }], ['OS=="win"', { 'include_dirs': [ 'third_party/wtl/include', @@ -3888,6 +3893,7 @@ ['OS=="linux"', { 'dependencies': [ '../build/linux/system.gyp:gtk', + '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', ], 'sources!': [ # TODO(port) @@ -4301,6 +4307,7 @@ 'dependencies': [ '../build/linux/system.gyp:gtk', '../build/linux/system.gyp:nss', + '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', ], 'sources': [ 'browser/renderer_host/gtk_key_bindings_handler_unittest.cc', @@ -4481,6 +4488,7 @@ ['OS=="linux"', { 'dependencies': [ '../build/linux/system.gyp:gtk', + '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', ], }], ['OS=="linux" and toolkit_views==1', { @@ -4603,6 +4611,7 @@ ['OS=="linux"', { 'dependencies': [ '../build/linux/system.gyp:gtk', + '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', ], }], ['OS=="win" or (OS=="linux" and toolkit_views==1)', { @@ -4635,6 +4644,7 @@ ['OS=="linux"', { 'dependencies': [ '../build/linux/system.gyp:gtk', + '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', ], }], ['OS=="win"', { @@ -4667,6 +4677,7 @@ ['OS=="linux"', { 'dependencies': [ '../build/linux/system.gyp:gtk', + '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', ], }], ], @@ -5233,6 +5244,7 @@ ['OS=="linux"', { 'dependencies': [ '../build/linux/system.gyp:gtk', + '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', ], 'sources!': [ # TODO(port): @@ -5307,6 +5319,7 @@ ['OS=="linux"', { 'dependencies': [ '../build/linux/system.gyp:gtk', + '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', ], 'sources!': [ # TODO(port) @@ -5430,6 +5443,7 @@ ['OS=="linux"', { 'dependencies': [ '../build/linux/system.gyp:gtk', + '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', ], }], ['OS=="linux" and (toolkit_views==1 or chromeos==1)', { @@ -6325,7 +6339,7 @@ }], ], }, - + { 'target_name': 'sync_unit_tests', 'type': 'executable', |