Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(80)

Side by Side Diff: chrome/installer/installer.gyp

Issue 155371: Switching in new gyp version (which changes 'none' back to how it was before)... (Closed) Base URL: svn://chrome-svn.corp.google.com/chrome/trunk/src/
Patch Set: '' Created 11 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « DEPS ('k') | google_update/google_update.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 'util/work_item_list_unittest.cc', 269 'util/work_item_list_unittest.cc',
270 ], 270 ],
271 'msvs_settings': { 271 'msvs_settings': {
272 'VCManifestTool': { 272 'VCManifestTool': {
273 'AdditionalManifestFiles': '$(ProjectDir)\\mini_installer\\mini_in staller.exe.manifest', 273 'AdditionalManifestFiles': '$(ProjectDir)\\mini_installer\\mini_in staller.exe.manifest',
274 }, 274 },
275 }, 275 },
276 }, 276 },
277 { 277 {
278 'target_name': 'installer_util_strings', 278 'target_name': 'installer_util_strings',
279 'type': 'none', 279 'type': 'dummy_executable',
280 'msvs_guid': '0026A376-C4F1-4575-A1BA-578C69F07013', 280 'msvs_guid': '0026A376-C4F1-4575-A1BA-578C69F07013',
281 'actions': [ 281 'actions': [
282 { 282 {
283 # TODO(sgk): Clean this up so that we pass in the 283 # TODO(sgk): Clean this up so that we pass in the
284 # file names to the script instead of having it hard-code 284 # file names to the script instead of having it hard-code
285 # matching path names internally. 285 # matching path names internally.
286 'action_name': 'installer_util_strings', 286 'action_name': 'installer_util_strings',
287 'inputs': [ 287 'inputs': [
288 'util/prebuild/create_string_rc.py', 288 'util/prebuild/create_string_rc.py',
289 '../app/generated_resources.grd', 289 '../app/generated_resources.grd',
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
479 'variables': { 479 'variables': {
480 'branding_dir': '../app/theme/google_chrome', 480 'branding_dir': '../app/theme/google_chrome',
481 }, 481 },
482 }, { # else branding!="Chrome" 482 }, { # else branding!="Chrome"
483 'variables': { 483 'variables': {
484 'branding_dir': '../app/theme/chromium', 484 'branding_dir': '../app/theme/chromium',
485 }, 485 },
486 }], 486 }],
487 ], 487 ],
488 } 488 }
OLDNEW
« no previous file with comments | « DEPS ('k') | google_update/google_update.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698