| 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 'branding_dir': 'app/theme/<(branding_path_component)', | 8 'branding_dir': 'app/theme/<(branding_path_component)', |
| 9 'branding_dir_100': 'app/theme/default_100_percent/<(branding_path_component
)', | 9 'branding_dir_100': 'app/theme/default_100_percent/<(branding_path_component
)', |
| 10 }, | 10 }, |
| (...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 203 }, | 203 }, |
| 204 'dependencies': [ | 204 'dependencies': [ |
| 205 '<(DEPTH)/base/base.gyp:base', | 205 '<(DEPTH)/base/base.gyp:base', |
| 206 ], | 206 ], |
| 207 'sources': [ | 207 'sources': [ |
| 208 'installer/launcher_support/chrome_launcher_support.cc', | 208 'installer/launcher_support/chrome_launcher_support.cc', |
| 209 'installer/launcher_support/chrome_launcher_support.h', | 209 'installer/launcher_support/chrome_launcher_support.h', |
| 210 ], | 210 ], |
| 211 }, | 211 }, |
| 212 { | 212 { |
| 213 # GN version: //chrome/installer/setup | 213 # GN version: //chrome/installer/setup:lib |
| 214 'target_name': 'setup', | 214 'target_name': 'setup_lib', |
| 215 'type': 'executable', | 215 'type': 'static_library', |
| 216 'dependencies': [ | 216 'dependencies': [ |
| 217 'installer_util', | 217 'installer_util', |
| 218 'installer_util_strings', | 218 'installer_util_strings', |
| 219 '../base/base.gyp:base', | 219 '../base/base.gyp:base', |
| 220 '../chrome/common_constants.gyp:common_constants', | |
| 221 '../chrome/common_constants.gyp:version_header', | |
| 222 '../chrome_elf/chrome_elf.gyp:chrome_elf_constants', | |
| 223 '../components/components.gyp:crash_component_breakpad_to_be_deleted
', | 220 '../components/components.gyp:crash_component_breakpad_to_be_deleted
', |
| 224 '../rlz/rlz.gyp:rlz_lib', | |
| 225 '../third_party/zlib/zlib.gyp:zlib', | |
| 226 ], | 221 ], |
| 227 'include_dirs': [ | 222 'include_dirs': [ |
| 228 '..', | 223 '..', |
| 229 '<(INTERMEDIATE_DIR)', | 224 '<(INTERMEDIATE_DIR)', |
| 230 '<(SHARED_INTERMEDIATE_DIR)/setup', | |
| 231 ], | 225 ], |
| 232 'direct_dependent_settings': { | |
| 233 'include_dirs': [ | |
| 234 '<(SHARED_INTERMEDIATE_DIR)/setup', | |
| 235 ], | |
| 236 }, | |
| 237 'sources': [ | 226 'sources': [ |
| 238 '<(SHARED_INTERMEDIATE_DIR)/chrome/installer/util/installer_util_str
ings.rc', | |
| 239 'installer/mini_installer/chrome.release', | |
| 240 'installer/setup/app_launcher_installer.cc', | 227 'installer/setup/app_launcher_installer.cc', |
| 241 'installer/setup/app_launcher_installer.h', | 228 'installer/setup/app_launcher_installer.h', |
| 242 'installer/setup/archive_patch_helper.cc', | 229 'installer/setup/archive_patch_helper.cc', |
| 243 'installer/setup/archive_patch_helper.h', | 230 'installer/setup/archive_patch_helper.h', |
| 244 'installer/setup/install.cc', | 231 'installer/setup/install.cc', |
| 245 'installer/setup/install.h', | 232 'installer/setup/install.h', |
| 246 'installer/setup/install_worker.cc', | 233 'installer/setup/install_worker.cc', |
| 247 'installer/setup/install_worker.h', | 234 'installer/setup/install_worker.h', |
| 248 'installer/setup/installer_crash_reporter_client.cc', | 235 'installer/setup/installer_crash_reporter_client.cc', |
| 249 'installer/setup/installer_crash_reporter_client.h', | 236 'installer/setup/installer_crash_reporter_client.h', |
| 250 'installer/setup/installer_crash_reporting.cc', | 237 'installer/setup/installer_crash_reporting.cc', |
| 251 'installer/setup/installer_crash_reporting.h', | 238 'installer/setup/installer_crash_reporting.h', |
| 239 'installer/setup/setup_constants.cc', |
| 240 'installer/setup/setup_constants.h', |
| 241 'installer/setup/setup_util.cc', |
| 242 'installer/setup/setup_util.h', |
| 243 'installer/setup/update_active_setup_version_work_item.cc', |
| 244 'installer/setup/update_active_setup_version_work_item.h', |
| 245 ], |
| 246 }, |
| 247 { |
| 248 # GN version: //chrome/installer/setup |
| 249 'target_name': 'setup', |
| 250 'type': 'executable', |
| 251 'dependencies': [ |
| 252 'setup_lib', |
| 253 '../chrome/common_constants.gyp:common_constants', |
| 254 '../chrome/common_constants.gyp:version_header', |
| 255 '../chrome_elf/chrome_elf.gyp:chrome_elf_constants', |
| 256 '../rlz/rlz.gyp:rlz_lib', |
| 257 '../third_party/zlib/zlib.gyp:zlib', |
| 258 ], |
| 259 'include_dirs': [ |
| 260 '..', |
| 261 '<(INTERMEDIATE_DIR)', |
| 262 '<(SHARED_INTERMEDIATE_DIR)/setup', |
| 263 ], |
| 264 'sources': [ |
| 265 '<(SHARED_INTERMEDIATE_DIR)/chrome/installer/util/installer_util_str
ings.rc', |
| 252 'installer/setup/setup.ico', | 266 'installer/setup/setup.ico', |
| 253 'installer/setup/setup.rc', | 267 'installer/setup/setup.rc', |
| 254 'installer/setup/setup_constants.cc', | |
| 255 'installer/setup/setup_constants.h', | |
| 256 'installer/setup/setup_exe_version.rc.version', | 268 'installer/setup/setup_exe_version.rc.version', |
| 257 'installer/setup/setup_main.cc', | 269 'installer/setup/setup_main.cc', |
| 258 'installer/setup/setup_main.h', | 270 'installer/setup/setup_main.h', |
| 259 'installer/setup/setup_resource.h', | 271 'installer/setup/setup_resource.h', |
| 260 'installer/setup/setup_util.cc', | |
| 261 'installer/setup/setup_util.h', | |
| 262 'installer/setup/uninstall.cc', | 272 'installer/setup/uninstall.cc', |
| 263 'installer/setup/uninstall.h', | 273 'installer/setup/uninstall.h', |
| 264 'installer/setup/update_active_setup_version_work_item.cc', | |
| 265 'installer/setup/update_active_setup_version_work_item.h', | |
| 266 ], | 274 ], |
| 267 'msvs_settings': { | 275 'msvs_settings': { |
| 268 'VCLinkerTool': { | 276 'VCLinkerTool': { |
| 269 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS | 277 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS |
| 270 }, | 278 }, |
| 271 'VCManifestTool': { | 279 'VCManifestTool': { |
| 272 'AdditionalManifestFiles': [ | 280 'AdditionalManifestFiles': [ |
| 273 '$(ProjectDir)\\installer\\setup\\setup.exe.manifest', | 281 '$(ProjectDir)\\installer\\setup\\setup.exe.manifest', |
| 274 ], | 282 ], |
| 275 }, | 283 }, |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 316 '<(allocator_target)', | 324 '<(allocator_target)', |
| 317 ], | 325 ], |
| 318 }], | 326 }], |
| 319 ], | 327 ], |
| 320 }, | 328 }, |
| 321 { | 329 { |
| 322 # GN version: //chrome/installer/setup:setup_unittests | 330 # GN version: //chrome/installer/setup:setup_unittests |
| 323 'target_name': 'setup_unittests', | 331 'target_name': 'setup_unittests', |
| 324 'type': 'executable', | 332 'type': 'executable', |
| 325 'dependencies': [ | 333 'dependencies': [ |
| 326 'installer_util', | 334 'setup_lib', |
| 327 'installer_util_strings', | |
| 328 '../base/base.gyp:base', | |
| 329 '../base/base.gyp:base_i18n', | 335 '../base/base.gyp:base_i18n', |
| 330 '../base/base.gyp:test_support_base', | 336 '../base/base.gyp:test_support_base', |
| 331 '../testing/gmock.gyp:gmock', | 337 '../testing/gmock.gyp:gmock', |
| 332 '../testing/gtest.gyp:gtest', | 338 '../testing/gtest.gyp:gtest', |
| 333 ], | 339 ], |
| 334 'include_dirs': [ | 340 'include_dirs': [ |
| 335 '..', | 341 '..', |
| 336 '<(INTERMEDIATE_DIR)', | 342 '<(INTERMEDIATE_DIR)', |
| 337 ], | 343 ], |
| 338 # TODO(robertshield): Move the items marked with "Move to lib" | |
| 339 # below into a separate lib and then link both setup.exe and | |
| 340 # setup_unittests.exe against that. | |
| 341 'sources': [ | 344 'sources': [ |
| 342 '<(SHARED_INTERMEDIATE_DIR)/chrome/installer/util/installer_util_str
ings.rc', | 345 '<(SHARED_INTERMEDIATE_DIR)/chrome/installer/util/installer_util_str
ings.rc', |
| 343 'installer/mini_installer/chrome.release', # Move to lib | |
| 344 'installer/mini_installer/appid.h', | 346 'installer/mini_installer/appid.h', |
| 345 'installer/mini_installer/chrome_appid.cc', | 347 'installer/mini_installer/chrome_appid.cc', |
| 346 'installer/mini_installer/configuration.cc', | 348 'installer/mini_installer/configuration.cc', |
| 347 'installer/mini_installer/configuration.h', | 349 'installer/mini_installer/configuration.h', |
| 348 'installer/mini_installer/configuration_test.cc', | 350 'installer/mini_installer/configuration_test.cc', |
| 349 'installer/mini_installer/decompress.cc', | 351 'installer/mini_installer/decompress.cc', |
| 350 'installer/mini_installer/decompress.h', | 352 'installer/mini_installer/decompress.h', |
| 351 'installer/mini_installer/decompress_test.cc', | 353 'installer/mini_installer/decompress_test.cc', |
| 352 'installer/mini_installer/mini_installer_constants.cc', | 354 'installer/mini_installer/mini_installer_constants.cc', |
| 353 'installer/mini_installer/mini_installer_constants.h', | 355 'installer/mini_installer/mini_installer_constants.h', |
| 354 'installer/mini_installer/mini_string.cc', | 356 'installer/mini_installer/mini_string.cc', |
| 355 'installer/mini_installer/mini_string.h', | 357 'installer/mini_installer/mini_string.h', |
| 356 'installer/mini_installer/mini_string_test.cc', | 358 'installer/mini_installer/mini_string_test.cc', |
| 357 'installer/mini_installer/regkey.cc', | 359 'installer/mini_installer/regkey.cc', |
| 358 'installer/mini_installer/regkey.h', | 360 'installer/mini_installer/regkey.h', |
| 359 'installer/setup/app_launcher_installer.cc', # Move to lib | |
| 360 'installer/setup/app_launcher_installer.h', # Move to lib | |
| 361 'installer/setup/archive_patch_helper.cc', # Move to lib | |
| 362 'installer/setup/archive_patch_helper.h', # Move to lib | |
| 363 'installer/setup/archive_patch_helper_unittest.cc', | 361 'installer/setup/archive_patch_helper_unittest.cc', |
| 364 'installer/setup/install.cc', # Move to lib | |
| 365 'installer/setup/install.h', # Move to lib | |
| 366 'installer/setup/install_unittest.cc', | 362 'installer/setup/install_unittest.cc', |
| 367 'installer/setup/install_worker.cc', # Move to lib | |
| 368 'installer/setup/install_worker.h', # Move to lib | |
| 369 'installer/setup/install_worker_unittest.cc', | 363 'installer/setup/install_worker_unittest.cc', |
| 370 'installer/setup/memory_unittest.cc', | 364 'installer/setup/memory_unittest.cc', |
| 371 'installer/setup/run_all_unittests.cc', | 365 'installer/setup/run_all_unittests.cc', |
| 372 'installer/setup/setup_constants.cc', # Move to lib | |
| 373 'installer/setup/setup_constants.h', # Move to lib | |
| 374 'installer/setup/setup_util.cc', | |
| 375 'installer/setup/setup_util_unittest.cc', | 366 'installer/setup/setup_util_unittest.cc', |
| 376 'installer/setup/setup_util_unittest.h', | 367 'installer/setup/setup_util_unittest.h', |
| 377 'installer/setup/update_active_setup_version_work_item.cc', # Move
to lib | |
| 378 'installer/setup/update_active_setup_version_work_item.h', # Move
to lib | |
| 379 'installer/setup/update_active_setup_version_work_item_unittest.cc', | 368 'installer/setup/update_active_setup_version_work_item_unittest.cc', |
| 380 ], | 369 ], |
| 381 'conditions': [ | 370 'conditions': [ |
| 382 ['win_use_allocator_shim==1', { | 371 ['win_use_allocator_shim==1', { |
| 383 'dependencies': [ | 372 'dependencies': [ |
| 384 '<(allocator_target)', | 373 '<(allocator_target)', |
| 385 ], | 374 ], |
| 386 }], | 375 }], |
| 387 ], | 376 ], |
| 388 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. | 377 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
| (...skipping 751 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1140 '../build/isolate.gypi', | 1129 '../build/isolate.gypi', |
| 1141 ], | 1130 ], |
| 1142 'sources': [ | 1131 'sources': [ |
| 1143 'setup_unittests.isolate', | 1132 'setup_unittests.isolate', |
| 1144 ], | 1133 ], |
| 1145 }, | 1134 }, |
| 1146 ], | 1135 ], |
| 1147 }], | 1136 }], |
| 1148 ], | 1137 ], |
| 1149 } | 1138 } |
| OLD | NEW |