| Index: chrome/installer/upgrade_test.gyp
|
| diff --git a/chrome/installer/upgrade_test.gyp b/chrome/installer/upgrade_test.gyp
|
| deleted file mode 100644
|
| index 1a05535e77f2c1ef18bcd5d438093fc5e78c6bed..0000000000000000000000000000000000000000
|
| --- a/chrome/installer/upgrade_test.gyp
|
| +++ /dev/null
|
| @@ -1,96 +0,0 @@
|
| -# Copyright (c) 2011 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.
|
| -
|
| -{
|
| - 'variables': {
|
| - 'chromium_code': 1,
|
| - 'branding_dir': '../app/theme/<(branding_path_component)',
|
| - 'version_py': '<(DEPTH)/build/util/version.py',
|
| - 'version_path': '../../chrome/VERSION',
|
| - 'lastchange_path': '<(DEPTH)/build/util/LASTCHANGE',
|
| - # 'branding_dir' is set in the 'conditions' section at the bottom.
|
| - 'msvs_use_common_release': 0,
|
| - 'msvs_use_common_linker_extras': 0,
|
| - },
|
| - 'includes': [
|
| - '../../build/win_precompile.gypi',
|
| - ],
|
| - 'conditions': [
|
| - ['OS=="win"', {
|
| - 'targets': [
|
| - {
|
| - # GN version: //chrome/installer/test:alternate_version_generator_lib
|
| - 'target_name': 'alternate_version_generator_lib',
|
| - 'type': 'static_library',
|
| - 'dependencies': [
|
| - '../chrome.gyp:installer_util',
|
| - '../common_constants.gyp:common_constants',
|
| - '../../base/base.gyp:base',
|
| - ],
|
| - 'include_dirs': [
|
| - '../..',
|
| - ],
|
| - 'sources': [
|
| - 'test/alternate_version_generator.cc',
|
| - 'test/alternate_version_generator.h',
|
| - 'test/pe_image_resources.cc',
|
| - 'test/pe_image_resources.h',
|
| - 'test/resource_loader.cc',
|
| - 'test/resource_loader.h',
|
| - 'test/resource_updater.cc',
|
| - 'test/resource_updater.h',
|
| - ],
|
| - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
|
| - 'msvs_disabled_warnings': [4267, ],
|
| - },
|
| - {
|
| - # GN version: //chrome/installer/test:upgrade_test
|
| - 'target_name': 'upgrade_test',
|
| - 'type': 'executable',
|
| - 'dependencies': [
|
| - 'alternate_version_generator_lib',
|
| - # This dependency, although correct, results in the mini installer
|
| - # being rebuilt every time upgrade_test is built. So disable it
|
| - # for now.
|
| - # TODO(grt): fix rules/targets/etc for
|
| - # mini_installer.gyp:mini_installer so that it does no work if
|
| - # nothing has changed, then un-comment this next line:
|
| - # 'mini_installer.gyp:mini_installer',
|
| - '../../base/base.gyp:test_support_base',
|
| - '../../testing/gtest.gyp:gtest',
|
| - '../chrome.gyp:installer_util',
|
| - '../common_constants.gyp:common_constants',
|
| - ],
|
| - 'include_dirs': [
|
| - '../..',
|
| - ],
|
| - 'sources': [
|
| - 'test/run_all_tests.cc',
|
| - 'test/upgrade_test.cc',
|
| - ],
|
| - },
|
| - {
|
| - # GN version: //chrome/installer/test:alternate_version_generator
|
| - 'target_name': 'alternate_version_generator',
|
| - 'type': 'executable',
|
| - 'dependencies': [
|
| - 'alternate_version_generator_lib',
|
| - '../../base/base.gyp:test_support_base',
|
| - '../../testing/gtest.gyp:gtest',
|
| - '../chrome.gyp:installer_util',
|
| - '../common_constants.gyp:common_constants',
|
| - ],
|
| - 'include_dirs': [
|
| - '../..',
|
| - ],
|
| - 'sources': [
|
| - 'test/alternate_version_generator_main.cc',
|
| - ],
|
| - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
|
| - 'msvs_disabled_warnings': [ 4267, ],
|
| - },
|
| - ],
|
| - }],
|
| - ],
|
| -}
|
|
|