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

Side by Side Diff: remoting/remoting.gyp

Issue 7355011: Modify Chromoting logging to hook into base logging. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 9 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « remoting/host/simple_host_process.cc ('k') | no next file » | 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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 'variables': { 6 'variables': {
7 # TODO(dmaclach): can we pick this up some other way? Right now it's 7 # TODO(dmaclach): can we pick this up some other way? Right now it's
8 # duplicated from chrome.gyp 8 # duplicated from chrome.gyp
9 'chromium_code': 1, 9 'chromium_code': 1,
10 # Use a consistent MIME-type independent of branding. 10 # Use a consistent MIME-type independent of branding.
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 # depends on. See comments in chromoting_instance.cc for details. 132 # depends on. See comments in chromoting_instance.cc for details.
133 # crbug.com/74951 133 # crbug.com/74951
134 '<(DEPTH)/webkit/support/webkit_support.gyp:glue', 134 '<(DEPTH)/webkit/support/webkit_support.gyp:glue',
135 '<(DEPTH)/skia/skia.gyp:skia', 135 '<(DEPTH)/skia/skia.gyp:skia',
136 ], 136 ],
137 'sources': [ 137 'sources': [
138 'client/plugin/chromoting_instance.cc', 138 'client/plugin/chromoting_instance.cc',
139 'client/plugin/chromoting_instance.h', 139 'client/plugin/chromoting_instance.h',
140 'client/plugin/chromoting_scriptable_object.cc', 140 'client/plugin/chromoting_scriptable_object.cc',
141 'client/plugin/chromoting_scriptable_object.h', 141 'client/plugin/chromoting_scriptable_object.h',
142 'client/plugin/pepper_client_logger.cc',
143 'client/plugin/pepper_client_logger.h',
144 'client/plugin/pepper_entrypoints.cc', 142 'client/plugin/pepper_entrypoints.cc',
145 'client/plugin/pepper_entrypoints.h', 143 'client/plugin/pepper_entrypoints.h',
146 'client/plugin/pepper_input_handler.cc', 144 'client/plugin/pepper_input_handler.cc',
147 'client/plugin/pepper_input_handler.h', 145 'client/plugin/pepper_input_handler.h',
148 'client/plugin/pepper_port_allocator_session.cc', 146 'client/plugin/pepper_port_allocator_session.cc',
149 'client/plugin/pepper_port_allocator_session.h', 147 'client/plugin/pepper_port_allocator_session.h',
150 'client/plugin/pepper_view.cc', 148 'client/plugin/pepper_view.cc',
151 'client/plugin/pepper_view.h', 149 'client/plugin/pepper_view.h',
152 'client/plugin/pepper_view_proxy.cc', 150 'client/plugin/pepper_view_proxy.cc',
153 'client/plugin/pepper_view_proxy.h', 151 'client/plugin/pepper_view_proxy.h',
(...skipping 12 matching lines...) Expand all
166 'dependencies': [ 164 'dependencies': [
167 'remoting_base', 165 'remoting_base',
168 'remoting_host', 166 'remoting_host',
169 'remoting_jingle_glue', 167 'remoting_jingle_glue',
170 '../third_party/npapi/npapi.gyp:npapi', 168 '../third_party/npapi/npapi.gyp:npapi',
171 ], 169 ],
172 'sources': [ 170 'sources': [
173 'host/plugin/host_plugin.cc', 171 'host/plugin/host_plugin.cc',
174 'host/plugin/host_plugin.def', 172 'host/plugin/host_plugin.def',
175 'host/plugin/host_plugin.rc', 173 'host/plugin/host_plugin.rc',
176 'host/plugin/host_plugin_logger.cc',
177 'host/plugin/host_plugin_logger.h',
178 'host/plugin/host_plugin_resource.h', 174 'host/plugin/host_plugin_resource.h',
179 'host/plugin/host_plugin_utils.cc', 175 'host/plugin/host_plugin_utils.cc',
180 'host/plugin/host_plugin_utils.h', 176 'host/plugin/host_plugin_utils.h',
181 'host/plugin/host_script_object.cc', 177 'host/plugin/host_script_object.cc',
182 'host/plugin/host_script_object.h', 178 'host/plugin/host_script_object.h',
183 ], 179 ],
184 'conditions': [ 180 'conditions': [
185 ['OS=="mac"', { 181 ['OS=="mac"', {
186 'mac_bundle': 1, 182 'mac_bundle': 1,
187 'xcode_settings': { 183 'xcode_settings': {
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 'base/decompressor.h', 315 'base/decompressor.h',
320 'base/decompressor_verbatim.cc', 316 'base/decompressor_verbatim.cc',
321 'base/decompressor_verbatim.h', 317 'base/decompressor_verbatim.h',
322 'base/decompressor_zlib.cc', 318 'base/decompressor_zlib.cc',
323 'base/decompressor_zlib.h', 319 'base/decompressor_zlib.h',
324 'base/encoder.h', 320 'base/encoder.h',
325 'base/encoder_vp8.cc', 321 'base/encoder_vp8.cc',
326 'base/encoder_vp8.h', 322 'base/encoder_vp8.h',
327 'base/encoder_row_based.cc', 323 'base/encoder_row_based.cc',
328 'base/encoder_row_based.h', 324 'base/encoder_row_based.h',
329 'base/logger.cc',
330 'base/logger.h',
331 'base/rate_counter.cc', 325 'base/rate_counter.cc',
332 'base/rate_counter.h', 326 'base/rate_counter.h',
333 'base/running_average.cc', 327 'base/running_average.cc',
334 'base/running_average.h', 328 'base/running_average.h',
329 'base/task_thread_proxy.cc',
330 'base/task_thread_proxy.h',
335 'base/tracer.cc', 331 'base/tracer.cc',
336 'base/tracer.h', 332 'base/tracer.h',
337 'base/types.h', 333 'base/types.h',
338 'base/util.cc', 334 'base/util.cc',
339 'base/util.h', 335 'base/util.h',
340 ], 336 ],
341 'conditions': [ 337 'conditions': [
342 ['target_arch=="arm"', { 338 ['target_arch=="arm"', {
343 'sources!': [ 339 'sources!': [
344 'base/decoder_vp8.cc', 340 'base/decoder_vp8.cc',
(...skipping 474 matching lines...) Expand 10 before | Expand all | Expand 10 after
819 ['target_arch=="arm"', { 815 ['target_arch=="arm"', {
820 'sources!': [ 816 'sources!': [
821 'base/decoder_vp8_unittest.cc', 817 'base/decoder_vp8_unittest.cc',
822 'base/encoder_vp8_unittest.cc', 818 'base/encoder_vp8_unittest.cc',
823 ], 819 ],
824 }], 820 }],
825 ], # end of 'conditions' 821 ], # end of 'conditions'
826 }, # end of target 'remoting_unittests' 822 }, # end of target 'remoting_unittests'
827 ], # end of targets 823 ], # end of targets
828 } 824 }
OLDNEW
« no previous file with comments | « remoting/host/simple_host_process.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698