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 'variables': { | 6 'variables': { |
| 7 'chromium_code': 1, | 7 'chromium_code': 1, |
| 8 | 8 |
| 9 'variables': { | 9 'variables': { |
| 10 'conditions': [ | 10 'conditions': [ |
| (...skipping 2370 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2381 }, # end of target 'remoting_host_logging' | 2381 }, # end of target 'remoting_host_logging' |
| 2382 | 2382 |
| 2383 { | 2383 { |
| 2384 'target_name': 'remoting_client', | 2384 'target_name': 'remoting_client', |
| 2385 'type': 'static_library', | 2385 'type': 'static_library', |
| 2386 'variables': { 'enable_wexit_time_destructors': 1, }, | 2386 'variables': { 'enable_wexit_time_destructors': 1, }, |
| 2387 'dependencies': [ | 2387 'dependencies': [ |
| 2388 'remoting_base', | 2388 'remoting_base', |
| 2389 'remoting_jingle_glue', | 2389 'remoting_jingle_glue', |
| 2390 'remoting_protocol', | 2390 'remoting_protocol', |
| 2391 '../third_party/webrtc/modules/modules.gyp:desktop_capture', | |
| 2391 ], | 2392 ], |
| 2392 'sources': [ | 2393 'sources': [ |
| 2393 'client/audio_decode_scheduler.cc', | 2394 'client/audio_decode_scheduler.cc', |
| 2394 'client/audio_decode_scheduler.h', | 2395 'client/audio_decode_scheduler.h', |
| 2395 'client/audio_player.cc', | 2396 'client/audio_player.cc', |
| 2396 'client/audio_player.h', | 2397 'client/audio_player.h', |
| 2397 'client/chromoting_client.cc', | 2398 'client/chromoting_client.cc', |
| 2398 'client/chromoting_client.h', | 2399 'client/chromoting_client.h', |
| 2399 'client/chromoting_stats.cc', | 2400 'client/chromoting_stats.cc', |
| 2400 'client/chromoting_stats.h', | 2401 'client/chromoting_stats.h', |
| (...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2728 '-lrpcrt4.lib', | 2729 '-lrpcrt4.lib', |
| 2729 '-lwtsapi32.lib', | 2730 '-lwtsapi32.lib', |
| 2730 ], | 2731 ], |
| 2731 }, | 2732 }, |
| 2732 }], | 2733 }], |
| 2733 ['OS=="mac" or (OS=="linux" and chromeos==0)', { | 2734 ['OS=="mac" or (OS=="linux" and chromeos==0)', { |
| 2734 # Javascript unittests are disabled on CrOS because they cause | 2735 # Javascript unittests are disabled on CrOS because they cause |
| 2735 # valgrind and test errors. | 2736 # valgrind and test errors. |
| 2736 # | 2737 # |
| 2737 # Javascript unittests are disabled on Windows because they add a | 2738 # Javascript unittests are disabled on Windows because they add a |
| 2738 » # dependency on 'common_constants' which (only on Windows) requires | 2739 # dependency on 'common_constants' which (only on Windows) requires |
| 2739 » # additional dependencies: | 2740 # additional dependencies: |
| 2740 # '../content/content.gyp:content_common', | 2741 # '../content/content.gyp:content_common', |
| 2741 # 'installer_util', | 2742 # 'installer_util', |
| 2742 » # These targets are defined in .gypi files that would need to be | 2743 # These targets are defined in .gypi files that would need to be |
| 2743 » # included here: | 2744 # included here: |
| 2744 # '../chrome/chrome_common.gypi', | 2745 # '../chrome/chrome_common.gypi', |
| 2745 # '../chrome/chrome_installer.gypi', | 2746 # '../chrome/chrome_installer.gypi', |
| 2746 # '../chrome/chrome_installer_util.gypi', | 2747 # '../chrome/chrome_installer_util.gypi', |
| 2747 » # But we can't do that because ninja will complain about multiple | 2748 # But we can't do that because ninja will complain about multiple |
| 2748 » # target definitions. | 2749 # target definitions. |
| 2749 » # TODO(garykac): Move installer_util into a proper .gyp file so that | 2750 # TODO(garykac): Move installer_util into a proper .gyp file so that |
| 2750 » # it can be included in multiple .gyp files. | 2751 # it can be included in multiple .gyp files. |
|
Wez
2013/07/03 23:43:48
What's happened here? Is Reitveld going nuts?
| |
| 2751 'includes': [ | 2752 'includes': [ |
| 2752 '../chrome/js_unittest_rules.gypi', | 2753 '../chrome/js_unittest_rules.gypi', |
| 2753 ], | 2754 ], |
| 2754 'dependencies': [ | 2755 'dependencies': [ |
| 2755 '../chrome/common_constants.gyp:common_constants', | 2756 '../chrome/common_constants.gyp:common_constants', |
| 2756 '../v8/tools/gyp/v8.gyp:v8', | 2757 '../v8/tools/gyp/v8.gyp:v8', |
| 2757 ], | 2758 ], |
| 2758 'sources': [ | 2759 'sources': [ |
| 2759 '../chrome/test/base/v8_unit_test.cc', | 2760 '../chrome/test/base/v8_unit_test.cc', |
| 2760 '../chrome/test/base/v8_unit_test.h', | 2761 '../chrome/test/base/v8_unit_test.h', |
| (...skipping 28 matching lines...) Expand all Loading... | |
| 2789 '../base/allocator/allocator.gyp:allocator', | 2790 '../base/allocator/allocator.gyp:allocator', |
| 2790 ], | 2791 ], |
| 2791 }, | 2792 }, |
| 2792 ], | 2793 ], |
| 2793 ], | 2794 ], |
| 2794 }], # end of 'toolkit_uses_gtk == 1' | 2795 }], # end of 'toolkit_uses_gtk == 1' |
| 2795 ], # end of 'conditions' | 2796 ], # end of 'conditions' |
| 2796 }, # end of target 'remoting_unittests' | 2797 }, # end of target 'remoting_unittests' |
| 2797 ], # end of targets | 2798 ], # end of targets |
| 2798 } | 2799 } |
| OLD | NEW |