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

Side by Side Diff: tools/android/forwarder2/forwarder.gyp

Issue 148643002: Hide X11 dependencies when use_x11=0. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Review Fix: remove blank lines Created 6 years, 10 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 | « media/cast/cast.gyp ('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) 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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'forwarder2', 8 'target_name': 'forwarder2',
9 'type': 'none', 9 'type': 'none',
10 'dependencies': [ 10 'dependencies': [
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 'pipe_notifier.cc', 55 'pipe_notifier.cc',
56 'socket.cc', 56 'socket.cc',
57 ], 57 ],
58 }, 58 },
59 { 59 {
60 'target_name': 'host_forwarder', 60 'target_name': 'host_forwarder',
61 'type': 'executable', 61 'type': 'executable',
62 'toolsets': ['host'], 62 'toolsets': ['host'],
63 'dependencies': [ 63 'dependencies': [
64 '../../../base/base.gyp:base', 64 '../../../base/base.gyp:base',
65 '../../../build/linux/system.gyp:x11',
66 '../common/common.gyp:android_tools_common', 65 '../common/common.gyp:android_tools_common',
67 ], 66 ],
68 'include_dirs': [ 67 'include_dirs': [
69 '../../..', 68 '../../..',
70 ], 69 ],
71 'sources': [ 70 'sources': [
72 'command.cc', 71 'command.cc',
73 'common.cc', 72 'common.cc',
74 'daemon.cc', 73 'daemon.cc',
75 'forwarder.cc', 74 'forwarder.cc',
76 'forwarders_manager.cc', 75 'forwarders_manager.cc',
77 'host_controller.cc', 76 'host_controller.cc',
78 'host_forwarder_main.cc', 77 'host_forwarder_main.cc',
79 'pipe_notifier.cc', 78 'pipe_notifier.cc',
80 'socket.cc', 79 'socket.cc',
81 # TODO(pliard): Remove this and x11 dependency above. This is needed 80 # TODO(pliard): Remove this. This is needed to avoid undefined
82 # to avoid undefined references at link time. 81 # references at link time.
83 '../../../base/message_loop/message_pump_glib.cc', 82 '../../../base/message_loop/message_pump_glib.cc',
84 '../../../base/message_loop/message_pump_gtk.cc', 83 '../../../base/message_loop/message_pump_gtk.cc',
85 ], 84 ],
86 }, 85 },
87 ], 86 ],
88 } 87 }
OLDNEW
« no previous file with comments | « media/cast/cast.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698