Index: chrome/chrome_installer_static.gypi |
diff --git a/chrome/chrome_installer_static.gypi b/chrome/chrome_installer_static.gypi |
deleted file mode 100644 |
index 0fc597fa033ca447c93d0adaaef448366a33bcad..0000000000000000000000000000000000000000 |
--- a/chrome/chrome_installer_static.gypi |
+++ /dev/null |
@@ -1,114 +0,0 @@ |
-# Copyright 2016 The Chromium Authors. All rights reserved. |
-# Use of this source code is governed by a BSD-style license that can be |
-# found in the LICENSE file. |
- |
-# The install_static_util target should only depend on functions in kernel32. |
-# Please don't add dependencies on other system libraries. |
-{ |
- 'target_defaults': { |
- 'variables': { |
- 'installer_static_target': 0, |
- }, |
- 'target_conditions': [ |
- # This part is shared between the two versions of the target. |
- ['installer_static_target==1', { |
- 'sources': [ |
- 'install_static/install_util.h', |
- 'install_static/install_util.cc', |
- ], |
- 'include_dirs': [ |
- '<(DEPTH)', |
- ], |
- }], |
- ], |
- }, |
- 'conditions': [ |
- ['OS=="win"', { |
- 'targets': [ |
- { |
- # GN version: //chrome/install_static |
- 'target_name': 'install_static_util', |
- 'type': 'static_library', |
- 'variables': { |
- 'installer_static_target': 1, |
- }, |
- 'dependencies': [ |
- '../chrome_elf/nt_registry/nt_registry.gyp:chrome_elf_nt_registry', |
- ], |
- 'msvs_settings': { |
- 'VCLinkerTool': { |
- # Please don't add dependencies on other system libraries. |
- 'AdditionalDependencies': [ |
- 'kernel32.lib', |
- ], |
- }, |
- }, |
- }, |
- { |
- 'target_name': 'install_static_unittests', |
- 'type': 'executable', |
- 'sources': [ |
- 'install_static/install_util_unittest.cc', |
- ], |
- 'include_dirs': [ |
- '..', |
- '<(SHARED_INTERMEDIATE_DIR)', |
- ], |
- 'dependencies': [ |
- '../base/base.gyp:base', |
- '../base/base.gyp:run_all_unittests', |
- '../base/base.gyp:test_support_base', |
- 'chrome.gyp:install_static_util', |
- '../testing/gmock.gyp:gmock', |
- '../testing/gtest.gyp:gtest', |
- ], |
- }, |
- ], |
- }], |
- ['OS=="win" and test_isolation_mode != "noop"', { |
- 'targets': [ |
- { |
- 'target_name': 'install_static_unittests_run', |
- 'type': 'none', |
- 'dependencies': [ |
- 'install_static_unittests', |
- ], |
- 'includes': [ '../build/isolate.gypi' ], |
- 'sources': [ |
- 'install_static_unittests.isolate' |
- ], |
- }, |
- ], |
- }], |
- ['OS=="win" and target_arch=="ia32"', { |
- 'targets': [ |
- { |
- 'target_name': 'install_static_util_nacl_win64', |
- 'type': 'static_library', |
- 'variables': { |
- 'installer_static_target': 1, |
- }, |
- 'dependencies': [ |
- '../chrome_elf/nt_registry/nt_registry.gyp:chrome_elf_nt_registry_nacl_win64', |
- ], |
- 'include_dirs': [ |
- '<(SHARED_INTERMEDIATE_DIR)', |
- ], |
- 'configurations': { |
- 'Common_Base': { |
- 'msvs_target_platform': 'x64', |
- }, |
- }, |
- 'msvs_settings': { |
- 'VCLinkerTool': { |
- # Please don't add dependencies on other system libraries. |
- 'AdditionalDependencies': [ |
- 'kernel32.lib', |
- ], |
- }, |
- }, |
- }, |
- ], |
- }], |
- ], |
-} |