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

Side by Side Diff: remoting/remoting_nacl.gyp

Issue 1228283004: Cleanup inconsistencies between GN and GYP in //remoting (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 months 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/remoting_host_win.gypi ('k') | remoting/remoting_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 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 '../build/common_untrusted.gypi', 7 '../build/common_untrusted.gypi',
8 'remoting_srcs.gypi', 8 'remoting_srcs.gypi',
9 ], 9 ],
10 10
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 'remoting_proto_nacl', 112 'remoting_proto_nacl',
113 'remoting_webrtc_nacl', 113 'remoting_webrtc_nacl',
114 ], 114 ],
115 'sources': [ 115 'sources': [
116 '../ui/events/keycodes/dom/keycode_converter.cc', 116 '../ui/events/keycodes/dom/keycode_converter.cc',
117 '<@(remoting_base_sources)', 117 '<@(remoting_base_sources)',
118 '<@(remoting_codec_sources)', 118 '<@(remoting_codec_sources)',
119 '<@(remoting_client_plugin_sources)', 119 '<@(remoting_client_plugin_sources)',
120 '<@(remoting_client_sources)', 120 '<@(remoting_client_sources)',
121 '<@(remoting_protocol_sources)', 121 '<@(remoting_protocol_sources)',
122 '<@(remoting_signaling_sources)',
122 ], 123 ],
123 'sources!': [ 124 'sources!': [
124 'base/url_request_context_getter.cc', 125 'base/url_request_context_getter.cc',
125 'protocol/chromium_socket_factory.cc', 126 'protocol/chromium_socket_factory.cc',
126 ], 127 ],
127 128
128 # Include normalizing_input_filter_mac.cc excluded by the filename 129 # Include normalizing_input_filter_mac.cc excluded by the filename
129 # exclusion rules. Must be in target_conditions to make sure it's 130 # exclusion rules. Must be in target_conditions to make sure it's
130 # evaluated after the filename rules. 131 # evaluated after the filename rules.
131 'target_conditions': [ 132 'target_conditions': [
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 '-lppapi_cpp', 232 '-lppapi_cpp',
232 '-lpthread', 233 '-lpthread',
233 '-lnacl_io', 234 '-lnacl_io',
234 ], 235 ],
235 'sources': [ 236 'sources': [
236 'client/plugin/pepper_module.cc', 237 'client/plugin/pepper_module.cc',
237 ], 238 ],
238 }, # end of target 'remoting_client_plugin_nacl' 239 }, # end of target 'remoting_client_plugin_nacl'
239 ] 240 ]
240 } 241 }
OLDNEW
« no previous file with comments | « remoting/remoting_host_win.gypi ('k') | remoting/remoting_srcs.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698