| 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   'variables': { | 6   'variables': { | 
| 7     'chromium_code': 1, | 7     'chromium_code': 1, | 
| 8 | 8 | 
| 9     'variables': { | 9     'variables': { | 
| 10       'conditions': [ | 10       'conditions': [ | 
| (...skipping 1926 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1937         '../skia/skia.gyp:skia', | 1937         '../skia/skia.gyp:skia', | 
| 1938         '../third_party/webrtc/modules/modules.gyp:desktop_capture', | 1938         '../third_party/webrtc/modules/modules.gyp:desktop_capture', | 
| 1939       ], | 1939       ], | 
| 1940       'sources': [ | 1940       'sources': [ | 
| 1941         'client/plugin/chromoting_instance.cc', | 1941         'client/plugin/chromoting_instance.cc', | 
| 1942         'client/plugin/chromoting_instance.h', | 1942         'client/plugin/chromoting_instance.h', | 
| 1943         'client/plugin/mac_key_event_processor.cc', | 1943         'client/plugin/mac_key_event_processor.cc', | 
| 1944         'client/plugin/mac_key_event_processor.h', | 1944         'client/plugin/mac_key_event_processor.h', | 
| 1945         'client/plugin/pepper_audio_player.cc', | 1945         'client/plugin/pepper_audio_player.cc', | 
| 1946         'client/plugin/pepper_audio_player.h', | 1946         'client/plugin/pepper_audio_player.h', | 
|  | 1947         'client/plugin/pepper_desktop_frame.cc', | 
|  | 1948         'client/plugin/pepper_desktop_frame.h', | 
| 1947         'client/plugin/pepper_entrypoints.cc', | 1949         'client/plugin/pepper_entrypoints.cc', | 
| 1948         'client/plugin/pepper_entrypoints.h', | 1950         'client/plugin/pepper_entrypoints.h', | 
| 1949         'client/plugin/pepper_input_handler.cc', | 1951         'client/plugin/pepper_input_handler.cc', | 
| 1950         'client/plugin/pepper_input_handler.h', | 1952         'client/plugin/pepper_input_handler.h', | 
| 1951         'client/plugin/pepper_network_manager.cc', | 1953         'client/plugin/pepper_network_manager.cc', | 
| 1952         'client/plugin/pepper_network_manager.h', | 1954         'client/plugin/pepper_network_manager.h', | 
| 1953         'client/plugin/pepper_packet_socket_factory.cc', | 1955         'client/plugin/pepper_packet_socket_factory.cc', | 
| 1954         'client/plugin/pepper_packet_socket_factory.h', | 1956         'client/plugin/pepper_packet_socket_factory.h', | 
| 1955         'client/plugin/pepper_plugin_thread_delegate.cc', | 1957         'client/plugin/pepper_plugin_thread_delegate.cc', | 
| 1956         'client/plugin/pepper_plugin_thread_delegate.h', | 1958         'client/plugin/pepper_plugin_thread_delegate.h', | 
| (...skipping 424 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 2381     },  # end of target 'remoting_host_logging' | 2383     },  # end of target 'remoting_host_logging' | 
| 2382 | 2384 | 
| 2383     { | 2385     { | 
| 2384       'target_name': 'remoting_client', | 2386       'target_name': 'remoting_client', | 
| 2385       'type': 'static_library', | 2387       'type': 'static_library', | 
| 2386       'variables': { 'enable_wexit_time_destructors': 1, }, | 2388       'variables': { 'enable_wexit_time_destructors': 1, }, | 
| 2387       'dependencies': [ | 2389       'dependencies': [ | 
| 2388         'remoting_base', | 2390         'remoting_base', | 
| 2389         'remoting_jingle_glue', | 2391         'remoting_jingle_glue', | 
| 2390         'remoting_protocol', | 2392         'remoting_protocol', | 
|  | 2393         '../third_party/webrtc/modules/modules.gyp:desktop_capture', | 
| 2391       ], | 2394       ], | 
| 2392       'sources': [ | 2395       'sources': [ | 
| 2393         'client/audio_decode_scheduler.cc', | 2396         'client/audio_decode_scheduler.cc', | 
| 2394         'client/audio_decode_scheduler.h', | 2397         'client/audio_decode_scheduler.h', | 
| 2395         'client/audio_player.cc', | 2398         'client/audio_player.cc', | 
| 2396         'client/audio_player.h', | 2399         'client/audio_player.h', | 
| 2397         'client/chromoting_client.cc', | 2400         'client/chromoting_client.cc', | 
| 2398         'client/chromoting_client.h', | 2401         'client/chromoting_client.h', | 
| 2399         'client/chromoting_stats.cc', | 2402         'client/chromoting_stats.cc', | 
| 2400         'client/chromoting_stats.h', | 2403         'client/chromoting_stats.h', | 
| (...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 2728               '-lrpcrt4.lib', | 2731               '-lrpcrt4.lib', | 
| 2729               '-lwtsapi32.lib', | 2732               '-lwtsapi32.lib', | 
| 2730             ], | 2733             ], | 
| 2731           }, | 2734           }, | 
| 2732         }], | 2735         }], | 
| 2733         ['OS=="mac" or (OS=="linux" and chromeos==0)', { | 2736         ['OS=="mac" or (OS=="linux" and chromeos==0)', { | 
| 2734           # Javascript unittests are disabled on CrOS because they cause | 2737           # Javascript unittests are disabled on CrOS because they cause | 
| 2735           # valgrind and test errors. | 2738           # valgrind and test errors. | 
| 2736           # | 2739           # | 
| 2737           # Javascript unittests are disabled on Windows because they add a | 2740           # Javascript unittests are disabled on Windows because they add a | 
| 2738 »         # dependency on 'common_constants' which (only on Windows) requires | 2741           # dependency on 'common_constants' which (only on Windows) requires | 
| 2739 »         # additional dependencies: | 2742           # additional dependencies: | 
| 2740           #   '../content/content.gyp:content_common', | 2743           #   '../content/content.gyp:content_common', | 
| 2741           #   'installer_util', | 2744           #   'installer_util', | 
| 2742 »         # These targets are defined in .gypi files that would need to be | 2745           # These targets are defined in .gypi files that would need to be | 
| 2743 »         # included here: | 2746           # included here: | 
| 2744           #   '../chrome/chrome_common.gypi', | 2747           #   '../chrome/chrome_common.gypi', | 
| 2745           #   '../chrome/chrome_installer.gypi', | 2748           #   '../chrome/chrome_installer.gypi', | 
| 2746           #   '../chrome/chrome_installer_util.gypi', | 2749           #   '../chrome/chrome_installer_util.gypi', | 
| 2747 »         # But we can't do that because ninja will complain about multiple | 2750           # But we can't do that because ninja will complain about multiple | 
| 2748 »         # target definitions. | 2751           # target definitions. | 
| 2749 »         # TODO(garykac): Move installer_util into a proper .gyp file so that | 2752           # TODO(garykac): Move installer_util into a proper .gyp file so that | 
| 2750 »         # it can be included in multiple .gyp files. | 2753           # it can be included in multiple .gyp files. | 
| 2751           'includes': [ | 2754           'includes': [ | 
| 2752             '../chrome/js_unittest_rules.gypi', | 2755             '../chrome/js_unittest_rules.gypi', | 
| 2753           ], | 2756           ], | 
| 2754           'dependencies': [ | 2757           'dependencies': [ | 
| 2755             '../chrome/common_constants.gyp:common_constants', | 2758             '../chrome/common_constants.gyp:common_constants', | 
| 2756             '../v8/tools/gyp/v8.gyp:v8', | 2759             '../v8/tools/gyp/v8.gyp:v8', | 
| 2757           ], | 2760           ], | 
| 2758           'sources': [ | 2761           'sources': [ | 
| 2759             '../chrome/test/base/v8_unit_test.cc', | 2762             '../chrome/test/base/v8_unit_test.cc', | 
| 2760             '../chrome/test/base/v8_unit_test.h', | 2763             '../chrome/test/base/v8_unit_test.h', | 
| (...skipping 28 matching lines...) Expand all  Loading... | 
| 2789                   '../base/allocator/allocator.gyp:allocator', | 2792                   '../base/allocator/allocator.gyp:allocator', | 
| 2790                 ], | 2793                 ], | 
| 2791               }, | 2794               }, | 
| 2792             ], | 2795             ], | 
| 2793           ], | 2796           ], | 
| 2794         }],  # end of 'toolkit_uses_gtk == 1' | 2797         }],  # end of 'toolkit_uses_gtk == 1' | 
| 2795       ],  # end of 'conditions' | 2798       ],  # end of 'conditions' | 
| 2796     },  # end of target 'remoting_unittests' | 2799     },  # end of target 'remoting_unittests' | 
| 2797   ],  # end of targets | 2800   ],  # end of targets | 
| 2798 } | 2801 } | 
| OLD | NEW | 
|---|