Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2016 The Chromium Authors. All rights reserved. | 1 # Copyright 2016 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 # The install_static_util target should only depend on functions in kernel32 | 5 # The install_static_util target should only depend on functions in kernel32 |
| 6 # and advapi32. Please don't add dependencies on other system libraries. | 6 # and advapi32. Please don't add dependencies on other system libraries. |
| 7 { | 7 { |
| 8 'target_defaults': { | 8 'target_defaults': { |
| 9 'variables': { | 9 'variables': { |
| 10 'installer_static_target': 0, | 10 'installer_static_target': 0, |
| (...skipping 28 matching lines...) Expand all Loading... | |
| 39 'msvs_settings': { | 39 'msvs_settings': { |
| 40 'VCLinkerTool': { | 40 'VCLinkerTool': { |
| 41 # Please don't add dependencies on other system libraries. | 41 # Please don't add dependencies on other system libraries. |
| 42 'AdditionalDependencies': [ | 42 'AdditionalDependencies': [ |
| 43 'kernel32.lib', | 43 'kernel32.lib', |
| 44 'advapi32.lib', | 44 'advapi32.lib', |
| 45 ], | 45 ], |
| 46 }, | 46 }, |
| 47 }, | 47 }, |
| 48 }, | 48 }, |
| 49 { | |
| 50 'target_name': 'install_static_unittests', | |
| 51 'type': 'executable', | |
| 52 'sources': [ | |
| 53 'install_static/install_util_unittest.cc', | |
| 54 ], | |
| 55 'include_dirs': [ | |
| 56 '..', | |
| 57 '<(SHARED_INTERMEDIATE_DIR)', | |
| 58 ], | |
| 59 'dependencies': [ | |
| 60 '../base/base.gyp:base', | |
| 61 '../base/base.gyp:run_all_unittests', | |
| 62 '../base/base.gyp:test_support_base', | |
| 63 'chrome.gyp:install_static_util', | |
| 64 '../testing/gmock.gyp:gmock', | |
| 65 '../testing/gtest.gyp:gtest', | |
| 66 ], | |
| 67 }, | |
| 49 ], | 68 ], |
| 69 'conditions': [ | |
| 70 ['test_isolation_mode != "noop"', { | |
| 71 'targets': [ | |
| 72 { | |
| 73 'target_name': 'install_static_unittests_run', | |
| 74 'type': 'none', | |
| 75 'dependencies': [ | |
| 76 'install_static_unittests', | |
| 77 ], | |
| 78 'includes': [ '../build/isolate.gypi' ], | |
| 79 'sources': [ | |
| 80 'install_static/install_static_unittests.isolate' | |
|
scottmg
2016/05/27 20:57:59
tabs here (rietveld's display of them is currently
ananta
2016/05/27 21:38:54
Done.
| |
| 81 ], | |
| 82 }, | |
| 83 ], | |
| 84 }], | |
| 50 }], | 85 }], |
| 51 ['OS=="win" and target_arch=="ia32"', { | 86 ['OS=="win" and target_arch=="ia32"', { |
| 52 'targets': [ | 87 'targets': [ |
| 53 { | 88 { |
| 54 'target_name': 'install_static_util_nacl_win64', | 89 'target_name': 'install_static_util_nacl_win64', |
| 55 'type': 'static_library', | 90 'type': 'static_library', |
| 56 'variables': { | 91 'variables': { |
| 57 'installer_static_target': 1, | 92 'installer_static_target': 1, |
| 58 }, | 93 }, |
| 59 'dependencies': [ | 94 'dependencies': [ |
| (...skipping 14 matching lines...) Expand all Loading... | |
| 74 'kernel32.lib', | 109 'kernel32.lib', |
| 75 'advapi32.lib', | 110 'advapi32.lib', |
| 76 ], | 111 ], |
| 77 }, | 112 }, |
| 78 }, | 113 }, |
| 79 }, | 114 }, |
| 80 ], | 115 ], |
| 81 }], | 116 }], |
| 82 ], | 117 ], |
| 83 } | 118 } |
| OLD | NEW |