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

Side by Side Diff: chrome/chrome.gyp

Issue 1090213002: optimize branding - use branding_path_component variable for defining pranding specific paths (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed according to comments Created 5 years, 8 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
OLDNEW
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 'variables': { 5 'variables': {
6 'chromium_code': 1, 6 'chromium_code': 1,
7 7
8 # Define the common dependencies that contain all the actual 8 # Define the common dependencies that contain all the actual
9 # Chromium functionality. This list gets pulled in below by 9 # Chromium functionality. This list gets pulled in below by
10 # the link of the actual chrome (or chromium) executable on 10 # the link of the actual chrome (or chromium) executable on
(...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after
404 '../content/content_shell_and_tests.gyp:content_browsertests', 404 '../content/content_shell_and_tests.gyp:content_browsertests',
405 '../content/content_shell_and_tests.gyp:content_shell', 405 '../content/content_shell_and_tests.gyp:content_shell',
406 '../content/content_shell_and_tests.gyp:content_unittests', 406 '../content/content_shell_and_tests.gyp:content_unittests',
407 '../net/net.gyp:net_unittests', 407 '../net/net.gyp:net_unittests',
408 '../ui/base/ui_base_tests.gyp:ui_base_unittests', 408 '../ui/base/ui_base_tests.gyp:ui_base_unittests',
409 ], 409 ],
410 }, 410 },
411 { 411 {
412 'target_name': 'chrome_version_resources', 412 'target_name': 'chrome_version_resources',
413 'type': 'none', 413 'type': 'none',
414 'conditions': [
415 ['branding == "Chrome"', {
416 'variables': {
417 'branding_path': 'app/theme/google_chrome/BRANDING',
418 },
419 }, { # else branding!="Chrome"
420 'variables': {
421 'branding_path': 'app/theme/chromium/BRANDING',
422 },
423 }],
424 ],
425 'variables': { 414 'variables': {
426 'output_dir': 'chrome_version', 415 'output_dir': 'chrome_version',
427 'template_input_path': 'app/chrome_version.rc.version', 416 'template_input_path': 'app/chrome_version.rc.version',
417 'branding_path': 'app/theme/<(branding_path_component)/BRANDING',
428 }, 418 },
429 'direct_dependent_settings': { 419 'direct_dependent_settings': {
430 'include_dirs': [ 420 'include_dirs': [
431 '<(SHARED_INTERMEDIATE_DIR)/<(output_dir)', 421 '<(SHARED_INTERMEDIATE_DIR)/<(output_dir)',
432 ], 422 ],
433 }, 423 },
434 'sources': [ 424 'sources': [
435 'app/chrome_exe.ver', 425 'app/chrome_exe.ver',
436 'app/chrome_dll.ver', 426 'app/chrome_dll.ver',
437 'app/nacl64_exe.ver', 427 'app/nacl64_exe.ver',
438 'app/other.ver', 428 'app/other.ver',
439 ], 429 ],
440 'includes': [ 430 'includes': [
441 'version_resource_rules.gypi', 431 'version_resource_rules.gypi',
442 ], 432 ],
443 }, 433 },
444 { 434 {
445 # GN version: //chrome:version_header 435 # GN version: //chrome:version_header
446 'target_name': 'chrome_version_header', 436 'target_name': 'chrome_version_header',
447 'type': 'none', 437 'type': 'none',
448 'hard_dependency': 1, 438 'hard_dependency': 1,
449 'actions': [ 439 'actions': [
450 { 440 {
451 'action_name': 'version_header', 441 'action_name': 'version_header',
452 'variables': { 442 'variables': {
453 'lastchange_path': 443 'lastchange_path':
454 '<(DEPTH)/build/util/LASTCHANGE', 444 '<(DEPTH)/build/util/LASTCHANGE',
445 'branding_path': 'app/theme/<(branding_path_component)/BRANDING' ,
455 }, 446 },
456 'conditions': [
457 ['branding == "Chrome"', {
458 'variables': {
459 'branding_path': 'app/theme/google_chrome/BRANDING',
460 },
461 }, { # else branding!="Chrome"
462 'variables': {
463 'branding_path': 'app/theme/chromium/BRANDING',
464 },
465 }],
466 ],
467 'inputs': [ 447 'inputs': [
468 '<(version_path)', 448 '<(version_path)',
469 '<(branding_path)', 449 '<(branding_path)',
470 '<(lastchange_path)', 450 '<(lastchange_path)',
471 'version.h.in', 451 'version.h.in',
472 ], 452 ],
473 'outputs': [ 453 'outputs': [
474 '<(SHARED_INTERMEDIATE_DIR)/version.h', 454 '<(SHARED_INTERMEDIATE_DIR)/version.h',
475 ], 455 ],
476 'action': [ 456 'action': [
(...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after
821 '<(DEPTH)/third_party/kasko' 801 '<(DEPTH)/third_party/kasko'
822 ], 802 ],
823 }, 803 },
824 }, 804 },
825 }, 805 },
826 }, 806 },
827 ], 807 ],
828 }], 808 }],
829 ], # 'conditions' 809 ], # 'conditions'
830 } 810 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698