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' is set in the 'conditions' section at the bottom. | 8 # 'branding_dir' is set in the 'conditions' section at the bottom. |
9 }, | 9 }, |
10 'conditions': [ | 10 'conditions': [ |
(...skipping 361 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
372 # TODO(mark): <(branding_dir) should be defined by the | 372 # TODO(mark): <(branding_dir) should be defined by the |
373 # global condition block at the bottom of the file, but | 373 # global condition block at the bottom of the file, but |
374 # this doesn't work due to the following issue: | 374 # this doesn't work due to the following issue: |
375 # | 375 # |
376 # http://code.google.com/p/gyp/issues/detail?id=22 | 376 # http://code.google.com/p/gyp/issues/detail?id=22 |
377 # | 377 # |
378 # Remove this block once the above issue is fixed. | 378 # Remove this block once the above issue is fixed. |
379 [ 'branding == "Chrome"', { | 379 [ 'branding == "Chrome"', { |
380 'variables': { | 380 'variables': { |
381 'branding_dir': 'app/theme/google_chrome', | 381 'branding_dir': 'app/theme/google_chrome', |
| 382 'branding_dir_100': 'app/theme/default_100_percent/google_chrom
e', |
382 }, | 383 }, |
383 }, { # else branding!="Chrome" | 384 }, { # else branding!="Chrome" |
384 'variables': { | 385 'variables': { |
385 'branding_dir': 'app/theme/chromium', | 386 'branding_dir': 'app/theme/chromium', |
| 387 'branding_dir_100': 'app/theme/default_100_percent/chromium', |
386 }, | 388 }, |
387 }], | 389 }], |
388 ], | 390 ], |
389 }, | 391 }, |
390 { | 392 { |
391 'target_name': 'setup_unittests', | 393 'target_name': 'setup_unittests', |
392 'type': 'executable', | 394 'type': 'executable', |
393 'dependencies': [ | 395 'dependencies': [ |
394 'installer_util', | 396 'installer_util', |
395 'installer_util_strings', | 397 'installer_util_strings', |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
462 ], | 464 ], |
463 }, | 465 }, |
464 ], | 466 ], |
465 }, | 467 }, |
466 ], | 468 ], |
467 }], | 469 }], |
468 ['OS=="linux" and branding=="Chrome"', { | 470 ['OS=="linux" and branding=="Chrome"', { |
469 'variables': { | 471 'variables': { |
470 # Always google_chrome since this only applies to branding==Chrome. | 472 # Always google_chrome since this only applies to branding==Chrome. |
471 'branding_dir': 'app/theme/google_chrome', | 473 'branding_dir': 'app/theme/google_chrome', |
| 474 'branding_dir_100': 'app/theme/default_100_percent/google_chrome', |
472 'version' : '<!(python <(version_py_path) -f ../chrome/VERSION -t "@MAJO
R@.@MINOR@.@BUILD@.@PATCH@")', | 475 'version' : '<!(python <(version_py_path) -f ../chrome/VERSION -t "@MAJO
R@.@MINOR@.@BUILD@.@PATCH@")', |
473 'revision' : '<!(python ../build/util/lastchange.py --revision-only)', | 476 'revision' : '<!(python ../build/util/lastchange.py --revision-only)', |
474 'packaging_files_common': [ | 477 'packaging_files_common': [ |
475 'installer/linux/internal/common/apt.include', | 478 'installer/linux/internal/common/apt.include', |
476 'installer/linux/internal/common/default-app.template', | 479 'installer/linux/internal/common/default-app.template', |
477 'installer/linux/internal/common/default-app-block.template', | 480 'installer/linux/internal/common/default-app-block.template', |
478 'installer/linux/internal/common/desktop.template', | 481 'installer/linux/internal/common/desktop.template', |
479 'installer/linux/internal/common/google-chrome/google-chrome.info', | 482 'installer/linux/internal/common/google-chrome/google-chrome.info', |
480 'installer/linux/internal/common/installer.include', | 483 'installer/linux/internal/common/installer.include', |
481 'installer/linux/internal/common/postinst.include', | 484 'installer/linux/internal/common/postinst.include', |
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
574 { | 577 { |
575 'destination': '<(PRODUCT_DIR)/installer/common/', | 578 'destination': '<(PRODUCT_DIR)/installer/common/', |
576 'files': [ | 579 'files': [ |
577 '<@(packaging_files_common)', | 580 '<@(packaging_files_common)', |
578 ] | 581 ] |
579 }, | 582 }, |
580 # Additional theme resources needed for package building. | 583 # Additional theme resources needed for package building. |
581 { | 584 { |
582 'destination': '<(PRODUCT_DIR)/installer/theme/', | 585 'destination': '<(PRODUCT_DIR)/installer/theme/', |
583 'files': [ | 586 'files': [ |
584 'default_100_percent/<(branding_dir)/product_logo_16.png', | 587 '<(branding_dir_100)/product_logo_16.png', |
585 '<(branding_dir)/product_logo_22.png', | 588 '<(branding_dir)/product_logo_22.png', |
586 '<(branding_dir)/product_logo_24.png', | 589 '<(branding_dir)/product_logo_24.png', |
587 'default_100_percent/<(branding_dir)/product_logo_32.png', | 590 '<(branding_dir_100)/product_logo_32.png', |
588 '<(branding_dir)/product_logo_48.png', | 591 '<(branding_dir)/product_logo_48.png', |
589 '<(branding_dir)/product_logo_64.png', | 592 '<(branding_dir)/product_logo_64.png', |
590 '<(branding_dir)/product_logo_128.png', | 593 '<(branding_dir)/product_logo_128.png', |
591 '<(branding_dir)/product_logo_256.png', | 594 '<(branding_dir)/product_logo_256.png', |
592 '<(branding_dir)/product_logo_32.xpm', | 595 '<(branding_dir)/product_logo_32.xpm', |
593 '<(branding_dir)/BRANDING', | 596 '<(branding_dir)/BRANDING', |
594 ], | 597 ], |
595 }, | 598 }, |
596 ], | 599 ], |
597 'actions': [ | 600 'actions': [ |
(...skipping 481 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1079 ], | 1082 ], |
1080 'sources': [ | 1083 'sources': [ |
1081 'installer/gcapi_mac/gcapi_example_client.mm', | 1084 'installer/gcapi_mac/gcapi_example_client.mm', |
1082 ], | 1085 ], |
1083 }, | 1086 }, |
1084 ], # targets | 1087 ], # targets |
1085 }], # OS=="mac" | 1088 }], # OS=="mac" |
1086 [ 'branding == "Chrome"', { | 1089 [ 'branding == "Chrome"', { |
1087 'variables': { | 1090 'variables': { |
1088 'branding_dir': 'app/theme/google_chrome', | 1091 'branding_dir': 'app/theme/google_chrome', |
| 1092 'branding_dir_100': 'app/theme/default_100_percent/google_chrome', |
1089 }, | 1093 }, |
1090 }, { # else branding!="Chrome" | 1094 }, { # else branding!="Chrome" |
1091 'variables': { | 1095 'variables': { |
1092 'branding_dir': 'app/theme/chromium', | 1096 'branding_dir': 'app/theme/chromium', |
| 1097 'branding_dir_100': 'app/theme/default_100_percent/chromium', |
1093 }, | 1098 }, |
1094 }], | 1099 }], |
1095 ], | 1100 ], |
1096 } | 1101 } |
OLD | NEW |