diff options
| author | kelvinp <kelvinp@chromium.org> | 2014-11-10 18:45:25 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-11 02:45:51 +0000 |
| commit | 1d3fbc02ea36d1054ed570bdf2fdb2d46e88e9ba (patch) | |
| tree | 275d805d3fa559963862799905e22faadd5d4c87 /chrome/chrome_browser_extensions.gypi | |
| parent | ada4a807bb8953b86bbc6c573a0a6c07801f91a9 (diff) | |
| download | chromium_src-1d3fbc02ea36d1054ed570bdf2fdb2d46e88e9ba.zip chromium_src-1d3fbc02ea36d1054ed570bdf2fdb2d46e88e9ba.tar.gz chromium_src-1d3fbc02ea36d1054ed570bdf2fdb2d46e88e9ba.tar.bz2 | |
Remote assistance on Chrome OS Part VIII - Compile on Ozone
This CL makes It2Me host compile on platforms that uses Ozone.
It replaces the X11-based LocalInputMonitor, MouseCursorMonitor and InputInjector
with placeholder implementations for Chrome OS.
An actual implementation is provided for the LocalInputMonitor with code ported from
https://codereview.chromium.org/652293003/.
BUG=431876
Review URL: https://codereview.chromium.org/700333007
Cr-Commit-Position: refs/heads/master@{#303578}
Diffstat (limited to 'chrome/chrome_browser_extensions.gypi')
| -rw-r--r-- | chrome/chrome_browser_extensions.gypi | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi index 273428c..dd08ccf 100644 --- a/chrome/chrome_browser_extensions.gypi +++ b/chrome/chrome_browser_extensions.gypi @@ -965,19 +965,13 @@ ], 'conditions': [ ['chromeos==1', { - 'conditions': [ - ['use_x11==1', { - 'dependencies': [ - '../remoting/remoting.gyp:remoting_it2me_host_static', - ], - 'include_dirs': [ - '../third_party/libjingle/source', - ], - }] + 'include_dirs': [ + '../third_party/libjingle/source', ], 'dependencies': [ '../build/linux/system.gyp:dbus', '../chromeos/ime/input_method.gyp:gencode', + '../remoting/remoting.gyp:remoting_it2me_host_static', '../third_party/libevent/libevent.gyp:libevent', ], 'sources': [ |