| 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 533 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 544 '<(deb_build)', | 544 '<(deb_build)', |
| 545 '<@(input_files)', | 545 '<@(input_files)', |
| 546 ], | 546 ], |
| 547 'outputs': [ | 547 'outputs': [ |
| 548 '<(PRODUCT_DIR)/google-chrome-<(channel)_<(version)-r<(revision)
_<(deb_arch).deb', | 548 '<(PRODUCT_DIR)/google-chrome-<(channel)_<(version)-r<(revision)
_<(deb_arch).deb', |
| 549 ], | 549 ], |
| 550 'action': [ '<@(deb_cmd)', '-c', '<(channel)', ], | 550 'action': [ '<@(deb_cmd)', '-c', '<(channel)', ], |
| 551 }, | 551 }, |
| 552 ], | 552 ], |
| 553 'conditions': [ | 553 'conditions': [ |
| 554 ['chromeos==0', { | 554 ['chromeos==0 and toolkit_views==0', { |
| 555 'actions': [ | 555 'actions': [ |
| 556 { | 556 { |
| 557 'variables': { | 557 'variables': { |
| 558 'channel': 'unstable', | 558 'channel': 'unstable', |
| 559 }, | 559 }, |
| 560 'action_name': 'rpm_packages_<(channel)', | 560 'action_name': 'rpm_packages_<(channel)', |
| 561 'process_outputs_as_sources': 1, | 561 'process_outputs_as_sources': 1, |
| 562 'inputs': [ | 562 'inputs': [ |
| 563 '<(rpm_build)', | 563 '<(rpm_build)', |
| 564 '<(PRODUCT_DIR)/installer/rpm/chrome.spec.template', | 564 '<(PRODUCT_DIR)/installer/rpm/chrome.spec.template', |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 620 }, | 620 }, |
| 621 }], | 621 }], |
| 622 ], | 622 ], |
| 623 } | 623 } |
| 624 | 624 |
| 625 # Local Variables: | 625 # Local Variables: |
| 626 # tab-width:2 | 626 # tab-width:2 |
| 627 # indent-tabs-mode:nil | 627 # indent-tabs-mode:nil |
| 628 # End: | 628 # End: |
| 629 # vim: set expandtab tabstop=2 shiftwidth=2: | 629 # vim: set expandtab tabstop=2 shiftwidth=2: |
| OLD | NEW |