Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 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 'variables': { | 5 'variables': { |
| 6 'chromium_code': 1, | 6 'chromium_code': 1, |
| 7 }, | 7 }, |
| 8 'includes': [ | 8 'includes': [ |
| 9 '../build/util/version.gypi', | 9 '../build/util/version.gypi', |
| 10 '../build/win_precompile.gypi', | 10 '../build/win_precompile.gypi', |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 68 }, | 68 }, |
| 69 }, | 69 }, |
| 70 { | 70 { |
| 71 'target_name': 'chrome_elf_unittests_exe', | 71 'target_name': 'chrome_elf_unittests_exe', |
| 72 'product_name': 'chrome_elf_unittests', | 72 'product_name': 'chrome_elf_unittests', |
| 73 'type': 'executable', | 73 'type': 'executable', |
| 74 'sources': [ | 74 'sources': [ |
| 75 'blacklist/test/blacklist_test.cc', | 75 'blacklist/test/blacklist_test.cc', |
| 76 'chrome_elf_util_unittest.cc', | 76 'chrome_elf_util_unittest.cc', |
| 77 'elf_imports_unittest.cc', | 77 'elf_imports_unittest.cc', |
| 78 'run_all_unittests.cc', | |
| 78 ], | 79 ], |
| 79 'include_dirs': [ | 80 'include_dirs': [ |
| 80 '..', | 81 '..', |
| 81 '<(SHARED_INTERMEDIATE_DIR)', | 82 '<(SHARED_INTERMEDIATE_DIR)', |
| 82 ], | 83 ], |
| 83 'dependencies': [ | 84 'dependencies': [ |
| 84 '../base/base.gyp:base', | 85 '../base/base.gyp:base', |
| 85 '../base/base.gyp:run_all_unittests', | 86 '../base/base.gyp:run_all_unittests', |
| 86 '../base/base.gyp:test_support_base', | 87 '../base/base.gyp:test_support_base', |
| 87 '../chrome/chrome.gyp:install_static_util', | 88 '../chrome/chrome.gyp:install_static_util', |
| 88 '../sandbox/sandbox.gyp:sandbox', | 89 '../sandbox/sandbox.gyp:sandbox', |
| 89 '../testing/gtest.gyp:gtest', | 90 '../testing/gtest.gyp:gtest', |
| 90 'blacklist', | 91 'blacklist', |
| 91 'blacklist_test_dll_1', | 92 'blacklist_test_dll_1', |
| 92 'blacklist_test_dll_2', | 93 'blacklist_test_dll_2', |
| 93 'blacklist_test_dll_3', | 94 'blacklist_test_dll_3', |
| 94 'blacklist_test_main_dll', | 95 'blacklist_test_main_dll', |
| 95 ], | 96 ], |
| 97 'msvs_settings': { | |
| 98 'VCLinkerTool': { | |
| 99 # Set /SUBSYSTEM:WINDOWS. | |
| 100 'SubSystem': '2', | |
|
scottmg
2016/06/18 17:36:57
Why /subsystem:windows? Aren't we running main()?
ananta
2016/06/20 19:08:03
Removed.
| |
| 101 'AdditionalDependencies!': [ | |
| 102 'user32.lib', | |
| 103 ], | |
| 104 'IgnoreDefaultLibraryNames': [ | |
| 105 'user32.lib', | |
| 106 ], | |
| 107 }, | |
|
scottmg
2016/06/18 17:36:57
Do we not need all the delayloads that are in the
ananta
2016/06/20 19:08:03
No. The gn build pulls in a dependency on chrome a
| |
| 108 }, | |
| 96 }, | 109 }, |
| 97 { | 110 { |
| 98 # A dummy target to ensure that chrome_elf.dll and chrome.exe gets built | 111 # A dummy target to ensure that chrome_elf.dll and chrome.exe gets built |
| 99 # when building chrome_elf_unittests.exe without introducing an | 112 # when building chrome_elf_unittests.exe without introducing an |
| 100 # explicit runtime dependency. | 113 # explicit runtime dependency. |
| 101 'target_name': 'chrome_elf_unittests', | 114 'target_name': 'chrome_elf_unittests', |
| 102 'type': 'none', | 115 'type': 'none', |
| 103 'dependencies': [ | 116 'dependencies': [ |
| 104 '../chrome/chrome.gyp:chrome', | 117 '../chrome/chrome.gyp:chrome', |
| 105 '../chrome/chrome.gyp:install_static_util', | 118 '../chrome/chrome.gyp:install_static_util', |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 160 'dependencies': [ | 173 'dependencies': [ |
| 161 'chrome_elf_unittests', | 174 'chrome_elf_unittests', |
| 162 ], | 175 ], |
| 163 'includes': [ '../build/isolate.gypi' ], | 176 'includes': [ '../build/isolate.gypi' ], |
| 164 'sources': [ 'chrome_elf_unittests.isolate' ], | 177 'sources': [ 'chrome_elf_unittests.isolate' ], |
| 165 }, | 178 }, |
| 166 ], | 179 ], |
| 167 }], | 180 }], |
| 168 ], | 181 ], |
| 169 } | 182 } |
| OLD | NEW |