| 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 504 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 515 'ISOLATION_AWARE_ENABLED=1', | 515 'ISOLATION_AWARE_ENABLED=1', |
| 516 ], | 516 ], |
| 517 'dependencies': [ | 517 'dependencies': [ |
| 518 '../sandbox/sandbox.gyp:sandbox', | 518 '../sandbox/sandbox.gyp:sandbox', |
| 519 ], | 519 ], |
| 520 'msvs_settings': { | 520 'msvs_settings': { |
| 521 'VCCLCompilerTool': { | 521 'VCCLCompilerTool': { |
| 522 # /MP conflicts with #import directive so we limit the number | 522 # /MP conflicts with #import directive so we limit the number |
| 523 # of processes to spawn to 1. | 523 # of processes to spawn to 1. |
| 524 'AdditionalOptions': ['/MP1'], | 524 'AdditionalOptions': ['/MP1'], |
| 525 'ForcedIncludeFiles': [ 'build/intsafe_workaround.h' ], | |
| 526 }, | 525 }, |
| 527 }, | 526 }, |
| 528 }], | 527 }], |
| 529 ], | 528 ], |
| 530 }, # end of target 'remoting_host' | 529 }, # end of target 'remoting_host' |
| 531 | 530 |
| 532 { | 531 { |
| 533 'target_name': 'remoting_me2me_host_static', | 532 'target_name': 'remoting_me2me_host_static', |
| 534 'type': 'static_library', | 533 'type': 'static_library', |
| 535 'variables': { 'enable_wexit_time_destructors': 1, }, | 534 'variables': { 'enable_wexit_time_destructors': 1, }, |
| (...skipping 2370 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2906 ], | 2905 ], |
| 2907 'include_dirs': [ | 2906 'include_dirs': [ |
| 2908 '../breakpad/src', | 2907 '../breakpad/src', |
| 2909 ], | 2908 ], |
| 2910 'link_settings': { | 2909 'link_settings': { |
| 2911 'libraries': [ | 2910 'libraries': [ |
| 2912 '-lrpcrt4.lib', | 2911 '-lrpcrt4.lib', |
| 2913 '-lwtsapi32.lib', | 2912 '-lwtsapi32.lib', |
| 2914 ], | 2913 ], |
| 2915 }, | 2914 }, |
| 2916 'msvs_settings': { | |
| 2917 'VCCLCompilerTool': { | |
| 2918 'ForcedIncludeFiles': [ 'build/intsafe_workaround.h' ], | |
| 2919 }, | |
| 2920 }, | |
| 2921 }], | 2915 }], |
| 2922 [ 'OS=="mac" or (OS=="linux" and chromeos==0)', { | 2916 [ 'OS=="mac" or (OS=="linux" and chromeos==0)', { |
| 2923 # Javascript unittests are disabled on CrOS because they cause | 2917 # Javascript unittests are disabled on CrOS because they cause |
| 2924 # valgrind and test errors. | 2918 # valgrind and test errors. |
| 2925 # | 2919 # |
| 2926 # Javascript unittests are disabled on Windows because they add a | 2920 # Javascript unittests are disabled on Windows because they add a |
| 2927 # dependency on 'common_constants' which (only on Windows) requires | 2921 # dependency on 'common_constants' which (only on Windows) requires |
| 2928 # additional dependencies: | 2922 # additional dependencies: |
| 2929 # '../content/content.gyp:content_common', | 2923 # '../content/content.gyp:content_common', |
| 2930 # 'installer_util', | 2924 # 'installer_util', |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2983 '../base/allocator/allocator.gyp:allocator', | 2977 '../base/allocator/allocator.gyp:allocator', |
| 2984 ], | 2978 ], |
| 2985 }, | 2979 }, |
| 2986 ], | 2980 ], |
| 2987 ], | 2981 ], |
| 2988 }], # end of 'toolkit_uses_gtk == 1' | 2982 }], # end of 'toolkit_uses_gtk == 1' |
| 2989 ], # end of 'conditions' | 2983 ], # end of 'conditions' |
| 2990 }, # end of target 'remoting_unittests' | 2984 }, # end of target 'remoting_unittests' |
| 2991 ], # end of targets | 2985 ], # end of targets |
| 2992 } | 2986 } |
| OLD | NEW |