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

Side by Side Diff: remoting/remoting_host.gypi

Issue 756643006: Remote assistance on Chrome OS Part IX - Input injection on Ozone (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@Ozone_input_injection
Patch Set: Address feedback (wez) Created 6 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 unified diff | Download patch
« no previous file with comments | « remoting/host/local_input_monitor_chromeos.cc ('k') | remoting/remoting_host_srcs.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'includes': [ 6 'includes': [
7 'remoting_host_linux.gypi', 7 'remoting_host_linux.gypi',
8 'remoting_host_mac.gypi', 8 'remoting_host_mac.gypi',
9 'remoting_host_win.gypi', 9 'remoting_host_win.gypi',
10 ], 10 ],
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 ], 100 ],
101 'include_dirs': [ 101 'include_dirs': [
102 '../third_party/skia/include/utils', 102 '../third_party/skia/include/utils',
103 ], 103 ],
104 'sources!' : [ 104 'sources!' : [
105 'host/clipboard_x11.cc', 105 'host/clipboard_x11.cc',
106 'host/continue_window_linux.cc', 106 'host/continue_window_linux.cc',
107 'host/disconnect_window_linux.cc', 107 'host/disconnect_window_linux.cc',
108 'host/linux/x_server_clipboard.cc', 108 'host/linux/x_server_clipboard.cc',
109 'host/linux/x_server_clipboard.h', 109 'host/linux/x_server_clipboard.h',
110 'host/local_input_monitor_x11.cc',
110 'host/policy_hack/policy_watcher_linux.cc', 111 'host/policy_hack/policy_watcher_linux.cc',
111 'host/remoting_me2me_host.cc', 112 'host/remoting_me2me_host.cc',
112 ], 113 ],
113 'conditions': [ 114 'conditions': [
114 ['use_ash==1', { 115 ['use_ash==1', {
115 'dependencies': [ 116 'dependencies': [
116 '../ash/ash.gyp:ash', 117 '../ash/ash.gyp:ash',
117 ], 118 ],
118 }], 119 }],
119 ['use_ozone==0', { 120 ['use_ozone==0', {
120 'sources!': [ 121 'sources!': [
121 'host/input_injector_chromeos.cc', 122 'host/input_injector_chromeos.cc',
122 'host/input_injector_chromeos.h', 123 'host/input_injector_chromeos.h',
123 'host/local_input_monitor_chromeos.cc',
124 ], 124 ],
125 }, { # use_ozone==1
126 'dependencies' : [
127 '../ui/ozone/ozone.gyp:ozone',
128 ]
125 }], 129 }],
126 ], 130 ],
127 }], 131 }],
128 ['OS=="mac"', { 132 ['OS=="mac"', {
129 'dependencies': [ 133 'dependencies': [
130 '../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gy p:google_toolbox_for_mac', 134 '../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gy p:google_toolbox_for_mac',
131 ], 135 ],
132 'link_settings': { 136 'link_settings': {
133 'libraries': [ 137 'libraries': [
134 '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', 138 '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework',
(...skipping 583 matching lines...) Expand 10 before | Expand all | Expand 10 after
718 }], # mac_breakpad==1 722 }], # mac_breakpad==1
719 ], # conditions 723 ], # conditions
720 }], # OS=mac 724 }], # OS=mac
721 ], 725 ],
722 }, # end of target 'remoting_it2me_native_messaging_host' 726 }, # end of target 'remoting_it2me_native_messaging_host'
723 ], # end of 'targets' 727 ], # end of 'targets'
724 }], # # end of OS!="win" and enable_it2me_host==1 728 }], # # end of OS!="win" and enable_it2me_host==1
725 729
726 ], # end of 'conditions' 730 ], # end of 'conditions'
727 } 731 }
OLDNEW
« no previous file with comments | « remoting/host/local_input_monitor_chromeos.cc ('k') | remoting/remoting_host_srcs.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698