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

Side by Side Diff: remoting/remoting_host.gypi

Issue 830193002: Using PolicyServiceWatcher instead of PolicyWatcherLinux/Win/Mac. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed building for Chrome OS. Created 5 years, 11 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
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 28 matching lines...) Expand all
39 'variables': { 39 'variables': {
40 'enable_wexit_time_destructors': 1, 40 'enable_wexit_time_destructors': 1,
41 'host_bundle_name': '<!(python <(version_py_path) -f <(branding_path ) -t "@MAC_HOST_BUNDLE_NAME@")', 41 'host_bundle_name': '<!(python <(version_py_path) -f <(branding_path ) -t "@MAC_HOST_BUNDLE_NAME@")',
42 'prefpane_bundle_name': '<!(python <(version_py_path) -f <(branding_ path) -t "@MAC_PREFPANE_BUNDLE_NAME@")', 42 'prefpane_bundle_name': '<!(python <(version_py_path) -f <(branding_ path) -t "@MAC_PREFPANE_BUNDLE_NAME@")',
43 }, 43 },
44 'dependencies': [ 44 'dependencies': [
45 'remoting_base', 45 'remoting_base',
46 'remoting_protocol', 46 'remoting_protocol',
47 'remoting_resources', 47 'remoting_resources',
48 '../base/base.gyp:base_i18n', 48 '../base/base.gyp:base_i18n',
49 '../components/components.gyp:policy',
50 '../components/components.gyp:policy_component_common',
49 '../crypto/crypto.gyp:crypto', 51 '../crypto/crypto.gyp:crypto',
50 '../google_apis/google_apis.gyp:google_apis', 52 '../google_apis/google_apis.gyp:google_apis',
51 '../ipc/ipc.gyp:ipc', 53 '../ipc/ipc.gyp:ipc',
52 '../ui/events/events.gyp:dom4_keycode_converter', 54 '../ui/events/events.gyp:dom4_keycode_converter',
53 ], 55 ],
54 'defines': [ 56 'defines': [
55 'HOST_BUNDLE_NAME="<(host_bundle_name)"', 57 'HOST_BUNDLE_NAME="<(host_bundle_name)"',
56 'PREFPANE_BUNDLE_NAME="<(prefpane_bundle_name)"', 58 'PREFPANE_BUNDLE_NAME="<(prefpane_bundle_name)"',
57 'VERSION=<(version_full)', 59 'VERSION=<(version_full)',
58 ], 60 ],
(...skipping 22 matching lines...) Expand all
81 ], 83 ],
82 'link_settings': { 84 'link_settings': {
83 'libraries': [ 85 'libraries': [
84 '-lpam', 86 '-lpam',
85 ], 87 ],
86 }, 88 },
87 }], 89 }],
88 ['chromeos==1', { 90 ['chromeos==1', {
89 'dependencies' : [ 91 'dependencies' : [
90 '../cc/cc.gyp:cc', 92 '../cc/cc.gyp:cc',
91 '../components/components.gyp:policy_component_common',
92 '../content/content.gyp:content', 93 '../content/content.gyp:content',
93 '../ppapi/ppapi_internal.gyp:ppapi_host', 94 '../ppapi/ppapi_internal.gyp:ppapi_host',
94 '../skia/skia.gyp:skia', 95 '../skia/skia.gyp:skia',
95 '../ui/aura/aura.gyp:aura', 96 '../ui/aura/aura.gyp:aura',
96 '../ui/compositor/compositor.gyp:compositor', 97 '../ui/compositor/compositor.gyp:compositor',
97 '../ui/events/events.gyp:events', 98 '../ui/events/events.gyp:events',
98 '../ui/events/platform/events_platform.gyp:events_platform', 99 '../ui/events/platform/events_platform.gyp:events_platform',
99 '../ui/views/views.gyp:views', 100 '../ui/views/views.gyp:views',
100 ], 101 ],
101 'include_dirs': [ 102 'include_dirs': [
102 '../third_party/skia/include/utils', 103 '../third_party/skia/include/utils',
103 ], 104 ],
104 'sources!' : [ 105 'sources!' : [
105 'host/clipboard_x11.cc', 106 'host/clipboard_x11.cc',
106 'host/continue_window_linux.cc', 107 'host/continue_window_linux.cc',
107 'host/disconnect_window_linux.cc', 108 'host/disconnect_window_linux.cc',
108 'host/linux/x_server_clipboard.cc', 109 'host/linux/x_server_clipboard.cc',
109 'host/linux/x_server_clipboard.h', 110 'host/linux/x_server_clipboard.h',
110 'host/local_input_monitor_x11.cc', 111 'host/local_input_monitor_x11.cc',
111 'host/policy_hack/policy_watcher_linux.cc',
112 'host/remoting_me2me_host.cc', 112 'host/remoting_me2me_host.cc',
113 ], 113 ],
114 'conditions': [ 114 'conditions': [
115 ['use_ash==1', { 115 ['use_ash==1', {
116 'dependencies': [ 116 'dependencies': [
117 '../ash/ash.gyp:ash', 117 '../ash/ash.gyp:ash',
118 ], 118 ],
119 }], 119 }],
120 ['use_ozone==0', { 120 ['use_ozone==0', {
121 'sources!': [ 121 'sources!': [
(...skipping 615 matching lines...) Expand 10 before | Expand all | Expand 10 after
737 }], # mac_breakpad==1 737 }], # mac_breakpad==1
738 ], # conditions 738 ], # conditions
739 }], # OS=mac 739 }], # OS=mac
740 ], 740 ],
741 }, # end of target 'remoting_it2me_native_messaging_host' 741 }, # end of target 'remoting_it2me_native_messaging_host'
742 ], # end of 'targets' 742 ], # end of 'targets'
743 }], # # end of OS!="win" and enable_it2me_host==1 743 }], # # end of OS!="win" and enable_it2me_host==1
744 744
745 ], # end of 'conditions' 745 ], # end of 'conditions'
746 } 746 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698