| 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 'lastchange_path': '../build/util/LASTCHANGE', | 7 'lastchange_path': '../build/util/LASTCHANGE', |
| 8 'libpeer_target_type%': 'static_library', | 8 'libpeer_target_type%': 'static_library', |
| 9 # 'branding_dir' is set in the 'conditions' section at the bottom. | 9 # 'branding_dir' is set in the 'conditions' section at the bottom. |
| 10 }, | 10 }, |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 60 '../base/base.gyp:test_support_base', | 60 '../base/base.gyp:test_support_base', |
| 61 '../testing/gtest.gyp:gtest', | 61 '../testing/gtest.gyp:gtest', |
| 62 ], | 62 ], |
| 63 'include_dirs': [ | 63 'include_dirs': [ |
| 64 '..', | 64 '..', |
| 65 ], | 65 ], |
| 66 'sources': [ | 66 'sources': [ |
| 67 'installer/gcapi/gcapi_last_run_test.cc', | 67 'installer/gcapi/gcapi_last_run_test.cc', |
| 68 'installer/gcapi/gcapi_omaha_experiment_test.cc', | 68 'installer/gcapi/gcapi_omaha_experiment_test.cc', |
| 69 'installer/gcapi/gcapi_reactivation_test.cc', | 69 'installer/gcapi/gcapi_reactivation_test.cc', |
| 70 'installer/gcapi/gcapi_test.cc', |
| 71 'installer/gcapi/gcapi_test.rc', |
| 70 'installer/gcapi/gcapi_test_registry_overrider.cc', | 72 'installer/gcapi/gcapi_test_registry_overrider.cc', |
| 71 'installer/gcapi/gcapi_test_registry_overrider.h', | 73 'installer/gcapi/gcapi_test_registry_overrider.h', |
| 72 'installer/gcapi/gcapi_test.cc', | |
| 73 'installer/gcapi/gcapi_test.rc', | |
| 74 'installer/gcapi/resource.h', | 74 'installer/gcapi/resource.h', |
| 75 ], | 75 ], |
| 76 }, | 76 }, |
| 77 { | 77 { |
| 78 'target_name': 'installer_util_unittests', | 78 'target_name': 'installer_util_unittests', |
| 79 'type': 'executable', | 79 'type': 'executable', |
| 80 'dependencies': [ | 80 'dependencies': [ |
| 81 'installer_util', | 81 'installer_util', |
| 82 'installer_util_strings', | 82 'installer_util_strings', |
| 83 'installer/upgrade_test.gyp:alternate_version_generator_lib', | 83 'installer/upgrade_test.gyp:alternate_version_generator_lib', |
| 84 '../base/base.gyp:base', | 84 '../base/base.gyp:base', |
| 85 '../base/base.gyp:base_i18n', | 85 '../base/base.gyp:base_i18n', |
| 86 '../base/base.gyp:test_support_base', | 86 '../base/base.gyp:test_support_base', |
| 87 '../chrome/chrome.gyp:chrome_version_resources', | 87 '../chrome/chrome.gyp:chrome_version_resources', |
| 88 '../content/content.gyp:content_common', | 88 '../content/content.gyp:content_common', |
| 89 '../testing/gmock.gyp:gmock', | 89 '../testing/gmock.gyp:gmock', |
| 90 '../testing/gtest.gyp:gtest', | 90 '../testing/gtest.gyp:gtest', |
| 91 ], | 91 ], |
| 92 'include_dirs': [ | 92 'include_dirs': [ |
| 93 '..', | 93 '..', |
| 94 ], | 94 ], |
| 95 'sources': [ | 95 'sources': [ |
| 96 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', |
| 96 'installer/setup/compat_checks_unittest.cc', | 97 'installer/setup/compat_checks_unittest.cc', |
| 97 'installer/setup/setup_constants.cc', | 98 'installer/setup/setup_constants.cc', |
| 98 'installer/util/advanced_firewall_manager_win_unittest.cc', | 99 'installer/util/advanced_firewall_manager_win_unittest.cc', |
| 99 'installer/util/callback_work_item_unittest.cc', | 100 'installer/util/callback_work_item_unittest.cc', |
| 100 'installer/util/channel_info_unittest.cc', | 101 'installer/util/channel_info_unittest.cc', |
| 101 'installer/util/copy_tree_work_item_unittest.cc', | 102 'installer/util/copy_tree_work_item_unittest.cc', |
| 102 'installer/util/create_dir_work_item_unittest.cc', | 103 'installer/util/create_dir_work_item_unittest.cc', |
| 103 'installer/util/create_reg_key_work_item_unittest.cc', | 104 'installer/util/create_reg_key_work_item_unittest.cc', |
| 104 'installer/util/delete_after_reboot_helper_unittest.cc', | 105 'installer/util/delete_after_reboot_helper_unittest.cc', |
| 105 'installer/util/delete_reg_key_work_item_unittest.cc', | 106 'installer/util/delete_reg_key_work_item_unittest.cc', |
| (...skipping 24 matching lines...) Expand all Loading... |
| 130 'installer/util/registry_key_backup_unittest.cc', | 131 'installer/util/registry_key_backup_unittest.cc', |
| 131 'installer/util/registry_test_data.cc', | 132 'installer/util/registry_test_data.cc', |
| 132 'installer/util/registry_test_data.h', | 133 'installer/util/registry_test_data.h', |
| 133 'installer/util/run_all_unittests.cc', | 134 'installer/util/run_all_unittests.cc', |
| 134 'installer/util/self_cleaning_temp_dir_unittest.cc', | 135 'installer/util/self_cleaning_temp_dir_unittest.cc', |
| 135 'installer/util/set_reg_value_work_item_unittest.cc', | 136 'installer/util/set_reg_value_work_item_unittest.cc', |
| 136 'installer/util/shell_util_unittest.cc', | 137 'installer/util/shell_util_unittest.cc', |
| 137 'installer/util/uninstall_metrics_unittest.cc', | 138 'installer/util/uninstall_metrics_unittest.cc', |
| 138 'installer/util/wmi_unittest.cc', | 139 'installer/util/wmi_unittest.cc', |
| 139 'installer/util/work_item_list_unittest.cc', | 140 'installer/util/work_item_list_unittest.cc', |
| 140 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', | |
| 141 ], | 141 ], |
| 142 'msvs_settings': { | 142 'msvs_settings': { |
| 143 'VCManifestTool': { | 143 'VCManifestTool': { |
| 144 'AdditionalManifestFiles': [ | 144 'AdditionalManifestFiles': [ |
| 145 '$(ProjectDir)\\installer\\mini_installer\\mini_installer.exe.ma
nifest', | 145 '$(ProjectDir)\\installer\\mini_installer\\mini_installer.exe.ma
nifest', |
| 146 ], | 146 ], |
| 147 }, | 147 }, |
| 148 }, | 148 }, |
| 149 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. | 149 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
| 150 'msvs_disabled_warnings': [ 4267, ], | 150 'msvs_disabled_warnings': [ 4267, ], |
| (...skipping 946 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1097 'branding_dir_100': 'app/theme/default_100_percent/google_chrome', | 1097 'branding_dir_100': 'app/theme/default_100_percent/google_chrome', |
| 1098 }, | 1098 }, |
| 1099 }, { # else branding!="Chrome" | 1099 }, { # else branding!="Chrome" |
| 1100 'variables': { | 1100 'variables': { |
| 1101 'branding_dir': 'app/theme/chromium', | 1101 'branding_dir': 'app/theme/chromium', |
| 1102 'branding_dir_100': 'app/theme/default_100_percent/chromium', | 1102 'branding_dir_100': 'app/theme/default_100_percent/chromium', |
| 1103 }, | 1103 }, |
| 1104 }], | 1104 }], |
| 1105 ], | 1105 ], |
| 1106 } | 1106 } |
| OLD | NEW |