Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 ], |
| 11 | 11 |
| 12 'variables': { | 12 'variables': { |
| 13 'conditions': [ | 13 'conditions': [ |
| 14 # Remoting host is supported only on Windows, OSX and Linux (with X11). | 14 # Remoting host is supported only on Windows, OSX and Linux (with X11). |
| 15 ['OS=="win" or OS=="mac" or (OS=="linux" and chromeos==0 and use_x11==1)', { | 15 ['OS=="win" or OS=="mac" or (OS=="linux" and chromeos==0 and use_x11==1)', { |
| 16 'enable_remoting_host': 1, | 16 'enable_remoting_host': 1, |
| 17 }, { | 17 }, { |
| 18 'enable_remoting_host': 0, | 18 'enable_remoting_host': 0, |
| 19 }], | 19 }], |
| 20 ], | 20 ], |
| 21 }, | 21 }, |
| 22 | 22 |
| 23 'conditions': [ | 23 'conditions': [ |
| 24 ['enable_remoting_host==1', { | 24 ['enable_remoting_host==1 or enable_it2me_chromeos==1', { |
|
Sergey Ulanov
2014/09/06 02:03:25
I think ideally we want to have
enable_remoting_m
kelvinp
2014/09/09 21:19:47
Done.
| |
| 25 'targets': [ | 25 'targets': [ |
| 26 { | 26 { |
| 27 'target_name': 'remoting_host', | 27 'target_name': 'remoting_host', |
| 28 'type': 'static_library', | 28 'type': 'static_library', |
| 29 'variables': { | 29 'variables': { |
| 30 'enable_wexit_time_destructors': 1, | 30 'enable_wexit_time_destructors': 1, |
| 31 'host_bundle_name': '<!(python <(version_py_path) -f <(branding_path ) -t "@MAC_HOST_BUNDLE_NAME@")', | 31 'host_bundle_name': '<!(python <(version_py_path) -f <(branding_path ) -t "@MAC_HOST_BUNDLE_NAME@")', |
| 32 'prefpane_bundle_name': '<!(python <(version_py_path) -f <(branding_ path) -t "@MAC_PREFPANE_BUNDLE_NAME@")', | 32 'prefpane_bundle_name': '<!(python <(version_py_path) -f <(branding_ path) -t "@MAC_PREFPANE_BUNDLE_NAME@")', |
| 33 }, | 33 }, |
| 34 'dependencies': [ | 34 'dependencies': [ |
| (...skipping 22 matching lines...) Expand all Loading... | |
| 57 'host/audio_scheduler.cc', | 57 'host/audio_scheduler.cc', |
| 58 'host/audio_scheduler.h', | 58 'host/audio_scheduler.h', |
| 59 'host/audio_silence_detector.cc', | 59 'host/audio_silence_detector.cc', |
| 60 'host/audio_silence_detector.h', | 60 'host/audio_silence_detector.h', |
| 61 'host/basic_desktop_environment.cc', | 61 'host/basic_desktop_environment.cc', |
| 62 'host/basic_desktop_environment.h', | 62 'host/basic_desktop_environment.h', |
| 63 'host/branding.cc', | 63 'host/branding.cc', |
| 64 'host/branding.h', | 64 'host/branding.h', |
| 65 'host/capture_scheduler.cc', | 65 'host/capture_scheduler.cc', |
| 66 'host/capture_scheduler.h', | 66 'host/capture_scheduler.h', |
| 67 'host/chromeos/aura_desktop_capturer.cc', | |
| 68 'host/chromeos/aura_desktop_capturer.h', | |
| 67 'host/chromium_port_allocator_factory.cc', | 69 'host/chromium_port_allocator_factory.cc', |
| 68 'host/chromium_port_allocator_factory.h', | 70 'host/chromium_port_allocator_factory.h', |
| 69 'host/chromoting_host.cc', | 71 'host/chromoting_host.cc', |
| 70 'host/chromoting_host.h', | 72 'host/chromoting_host.h', |
| 71 'host/chromoting_host_context.cc', | 73 'host/chromoting_host_context.cc', |
| 72 'host/chromoting_host_context.h', | 74 'host/chromoting_host_context.h', |
| 73 'host/chromoting_messages.cc', | 75 'host/chromoting_messages.cc', |
| 74 'host/chromoting_messages.h', | 76 'host/chromoting_messages.h', |
| 75 'host/chromoting_param_traits.cc', | 77 'host/chromoting_param_traits.cc', |
| 76 'host/chromoting_param_traits.h', | 78 'host/chromoting_param_traits.h', |
| (...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 278 'host/win/session_desktop_environment.h', | 280 'host/win/session_desktop_environment.h', |
| 279 'host/win/session_input_injector.cc', | 281 'host/win/session_input_injector.cc', |
| 280 'host/win/session_input_injector.h', | 282 'host/win/session_input_injector.h', |
| 281 'host/win/window_station_and_desktop.cc', | 283 'host/win/window_station_and_desktop.cc', |
| 282 'host/win/window_station_and_desktop.h', | 284 'host/win/window_station_and_desktop.h', |
| 283 'host/win/wts_terminal_monitor.cc', | 285 'host/win/wts_terminal_monitor.cc', |
| 284 'host/win/wts_terminal_monitor.h', | 286 'host/win/wts_terminal_monitor.h', |
| 285 'host/win/wts_terminal_observer.h', | 287 'host/win/wts_terminal_observer.h', |
| 286 ], | 288 ], |
| 287 'conditions': [ | 289 'conditions': [ |
| 288 ['OS=="linux"', { | 290 ['OS=="linux" and chromeos=="0"', { |
| 289 'dependencies': [ | 291 'dependencies': [ |
| 290 # Always use GTK on Linux, even for Aura builds. | 292 # Always use GTK on Linux, even for Aura builds. |
| 291 '../build/linux/system.gyp:gtk', | 293 '../build/linux/system.gyp:gtk', |
| 292 '../build/linux/system.gyp:x11', | 294 '../build/linux/system.gyp:x11', |
| 293 '../build/linux/system.gyp:xext', | 295 '../build/linux/system.gyp:xext', |
| 294 '../build/linux/system.gyp:xfixes', | 296 '../build/linux/system.gyp:xfixes', |
| 295 '../build/linux/system.gyp:xi', | 297 '../build/linux/system.gyp:xi', |
| 296 '../build/linux/system.gyp:xrandr', | 298 '../build/linux/system.gyp:xrandr', |
| 297 '../build/linux/system.gyp:xtst', | 299 '../build/linux/system.gyp:xtst', |
| 298 ], | 300 ], |
| 299 'link_settings': { | 301 'link_settings': { |
| 300 'libraries': [ | 302 'libraries': [ |
| 301 '-lpam', | 303 '-lpam', |
| 302 ], | 304 ], |
| 303 }, | 305 }, |
| 304 }], | 306 }], |
| 307 ['chromeos==1', { | |
| 308 'dependencies' : [ | |
| 309 '../skia/skia.gyp:skia', | |
| 310 ], | |
| 311 'include_dirs': [ | |
| 312 '../third_party/skia/include/utils', | |
| 313 ], | |
| 314 "sources!" : [ | |
| 315 'host/continue_window.cc', | |
| 316 'host/continue_window.h', | |
| 317 'host/continue_window_linux.cc', | |
| 318 'host/disconnect_window.cc', | |
| 319 'host/disconnect_window_linux.cc', | |
| 320 'host/remoting_me2me_host.cc', | |
| 321 ] | |
| 322 }, { # chromeos==0 | |
| 323 "sources!" : [ | |
| 324 'host/chromeos/aura_desktop_capturer.cc', | |
| 325 'host/chromeos/aura_desktop_capturer.h', | |
| 326 ] | |
| 327 }], | |
| 305 ['OS=="mac"', { | 328 ['OS=="mac"', { |
| 306 'dependencies': [ | 329 'dependencies': [ |
| 307 '../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gy p:google_toolbox_for_mac', | 330 '../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gy p:google_toolbox_for_mac', |
| 308 ], | 331 ], |
| 309 'link_settings': { | 332 'link_settings': { |
| 310 'libraries': [ | 333 'libraries': [ |
| 311 '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', | 334 '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', |
| 312 'libpam.a', | 335 'libpam.a', |
| 313 ], | 336 ], |
| 314 }, | 337 }, |
| (...skipping 478 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 793 ], | 816 ], |
| 794 'defines': [ | 817 'defines': [ |
| 795 'VERSION=<(version_full)', | 818 'VERSION=<(version_full)', |
| 796 ], | 819 ], |
| 797 'sources': [ | 820 'sources': [ |
| 798 'host/it2me/it2me_native_messaging_host_entry_point.cc', | 821 'host/it2me/it2me_native_messaging_host_entry_point.cc', |
| 799 'host/it2me/it2me_native_messaging_host_main.cc', | 822 'host/it2me/it2me_native_messaging_host_main.cc', |
| 800 'host/it2me/it2me_native_messaging_host_main.h', | 823 'host/it2me/it2me_native_messaging_host_main.h', |
| 801 ], | 824 ], |
| 802 'conditions': [ | 825 'conditions': [ |
| 803 ['OS=="linux"', { | 826 ['OS=="linux" and chromeos=="0"', { |
| 804 'dependencies': [ | 827 'dependencies': [ |
| 805 # Always use GTK on Linux, even for Aura builds. | 828 # Always use GTK on Linux, even for Aura builds. |
| 806 '../build/linux/system.gyp:gtk', | 829 '../build/linux/system.gyp:gtk', |
| 807 ], | 830 ], |
| 808 }], | 831 }], |
| 809 ['OS=="linux" and use_allocator!="none"', { | 832 ['OS=="linux" and use_allocator!="none"', { |
| 810 'dependencies': [ | 833 'dependencies': [ |
| 811 '../base/allocator/allocator.gyp:allocator', | 834 '../base/allocator/allocator.gyp:allocator', |
| 812 ], | 835 ], |
| 813 }], | 836 }], |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 869 }], # mac_breakpad==1 | 892 }], # mac_breakpad==1 |
| 870 ], # conditions | 893 ], # conditions |
| 871 }], # OS=mac | 894 }], # OS=mac |
| 872 ], | 895 ], |
| 873 }, # end of target 'remoting_it2me_native_messaging_host' | 896 }, # end of target 'remoting_it2me_native_messaging_host' |
| 874 ], # end of 'targets' | 897 ], # end of 'targets' |
| 875 }], # OS!="win" | 898 }], # OS!="win" |
| 876 | 899 |
| 877 ], # end of 'conditions' | 900 ], # end of 'conditions' |
| 878 } | 901 } |
| OLD | NEW |