| OLD | NEW |
| 1 { | 1 { |
| 2 'variables': { | 2 'variables': { |
| 3 'version_py': '../../chrome/tools/build/version.py', | 3 'version_py': '../../chrome/tools/build/version.py', |
| 4 'version_path': '../../chrome/VERSION', | 4 'version_path': '../../chrome/VERSION', |
| 5 'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE', | 5 'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE', |
| 6 # 'branding_dir' is set in the 'conditions' section at the bottom. | 6 # 'branding_dir' is set in the 'conditions' section at the bottom. |
| 7 }, | 7 }, |
| 8 'includes': [ | 8 'includes': [ |
| 9 '../../build/common.gypi', | 9 '../../build/common.gypi', |
| 10 ], | 10 ], |
| (...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 267 'util/delete_reg_value_work_item_unittest.cc', | 267 'util/delete_reg_value_work_item_unittest.cc', |
| 268 'util/delete_tree_work_item_unittest.cc', | 268 'util/delete_tree_work_item_unittest.cc', |
| 269 'util/google_chrome_distribution_unittest.cc', | 269 'util/google_chrome_distribution_unittest.cc', |
| 270 'util/helper_unittest.cc', | 270 'util/helper_unittest.cc', |
| 271 'util/installer_util_unittests.rc', | 271 'util/installer_util_unittests.rc', |
| 272 'util/installer_util_unittests_resource.h', | 272 'util/installer_util_unittests_resource.h', |
| 273 'util/move_tree_work_item_unittest.cc', | 273 'util/move_tree_work_item_unittest.cc', |
| 274 'util/run_all_unittests.cc', | 274 'util/run_all_unittests.cc', |
| 275 'util/set_reg_value_work_item_unittest.cc', | 275 'util/set_reg_value_work_item_unittest.cc', |
| 276 'util/work_item_list_unittest.cc', | 276 'util/work_item_list_unittest.cc', |
| 277 'util/version_unittest.cc', |
| 277 ], | 278 ], |
| 278 'msvs_settings': { | 279 'msvs_settings': { |
| 279 'VCManifestTool': { | 280 'VCManifestTool': { |
| 280 'AdditionalManifestFiles': '$(ProjectDir)\\mini_installer\\mini_in
staller.exe.manifest', | 281 'AdditionalManifestFiles': '$(ProjectDir)\\mini_installer\\mini_in
staller.exe.manifest', |
| 281 }, | 282 }, |
| 282 }, | 283 }, |
| 283 }, | 284 }, |
| 284 { | 285 { |
| 285 'target_name': 'installer_util_strings', | 286 'target_name': 'installer_util_strings', |
| 286 'type': 'dummy_executable', | 287 'type': 'dummy_executable', |
| (...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 486 'variables': { | 487 'variables': { |
| 487 'branding_dir': '../app/theme/google_chrome', | 488 'branding_dir': '../app/theme/google_chrome', |
| 488 }, | 489 }, |
| 489 }, { # else branding!="Chrome" | 490 }, { # else branding!="Chrome" |
| 490 'variables': { | 491 'variables': { |
| 491 'branding_dir': '../app/theme/chromium', | 492 'branding_dir': '../app/theme/chromium', |
| 492 }, | 493 }, |
| 493 }], | 494 }], |
| 494 ], | 495 ], |
| 495 } | 496 } |
| OLD | NEW |