| 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 'conditions': [ | 8 'conditions': [ |
| 9 ['OS=="win"', { | 9 ['OS=="win"', { |
| 10 'targets': [ | 10 'targets': [ |
| (...skipping 550 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 561 '<(deb_build)', | 561 '<(deb_build)', |
| 562 '<@(input_files)', | 562 '<@(input_files)', |
| 563 ], | 563 ], |
| 564 'outputs': [ | 564 'outputs': [ |
| 565 '<(PRODUCT_DIR)/google-chrome-<(channel)_<(version)-r<(revision)
_<(deb_arch).deb', | 565 '<(PRODUCT_DIR)/google-chrome-<(channel)_<(version)-r<(revision)
_<(deb_arch).deb', |
| 566 ], | 566 ], |
| 567 'action': [ '<@(deb_cmd)', '-c', '<(channel)', ], | 567 'action': [ '<@(deb_cmd)', '-c', '<(channel)', ], |
| 568 }, | 568 }, |
| 569 ], | 569 ], |
| 570 'conditions': [ | 570 'conditions': [ |
| 571 ['target_arch=="ia32"', { | 571 ['target_arch=="ia32" and chromeos==0', { |
| 572 'actions': [ | 572 'actions': [ |
| 573 { | 573 { |
| 574 'variables': { | 574 'variables': { |
| 575 'channel': 'unstable', | 575 'channel': 'unstable', |
| 576 }, | 576 }, |
| 577 'action_name': 'rpm_packages_<(channel)', | 577 'action_name': 'rpm_packages_<(channel)', |
| 578 'process_outputs_as_sources': 1, | 578 'process_outputs_as_sources': 1, |
| 579 'inputs': [ | 579 'inputs': [ |
| 580 '<(rpm_build)', | 580 '<(rpm_build)', |
| 581 '<(PRODUCT_DIR)/installer/rpm/chrome.spec.template', | 581 '<(PRODUCT_DIR)/installer/rpm/chrome.spec.template', |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 631 'variables': { | 631 'variables': { |
| 632 'branding_dir': '../app/theme/google_chrome', | 632 'branding_dir': '../app/theme/google_chrome', |
| 633 }, | 633 }, |
| 634 }, { # else branding!="Chrome" | 634 }, { # else branding!="Chrome" |
| 635 'variables': { | 635 'variables': { |
| 636 'branding_dir': '../app/theme/chromium', | 636 'branding_dir': '../app/theme/chromium', |
| 637 }, | 637 }, |
| 638 }], | 638 }], |
| 639 ], | 639 ], |
| 640 } | 640 } |
| OLD | NEW |