| 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 'variables': { | 5 'variables': { |
| 6 'chromium_code': 1, | 6 'chromium_code': 1, |
| 7 | 7 |
| 8 'variables': { | 8 'variables': { |
| 9 'version_py_path': 'tools/build/version.py', | 9 'version_py_path': 'tools/build/version.py', |
| 10 'version_path': 'VERSION', | 10 'version_path': 'VERSION', |
| (...skipping 694 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 705 'target_name': 'build_app_dmg', | 705 'target_name': 'build_app_dmg', |
| 706 # Don't place this in the 'all' list; most won't want it. | 706 # Don't place this in the 'all' list; most won't want it. |
| 707 # In GYP, booleans are 0/1, not True/False. | 707 # In GYP, booleans are 0/1, not True/False. |
| 708 'suppress_wildcard': 1, | 708 'suppress_wildcard': 1, |
| 709 'type': 'none', | 709 'type': 'none', |
| 710 'dependencies': [ | 710 'dependencies': [ |
| 711 'chrome', | 711 'chrome', |
| 712 ], | 712 ], |
| 713 'variables': { | 713 'variables': { |
| 714 'build_app_dmg_script_path': 'tools/build/mac/build_app_dmg', | 714 'build_app_dmg_script_path': 'tools/build/mac/build_app_dmg', |
| 715 'pkg_dmg_script_path': 'installer/mac/pkg-dmg', |
| 715 | 716 |
| 716 'conditions': [ | 717 'conditions': [ |
| 717 # This duplicates the output path from build_app_dmg. | 718 # This duplicates the output path from build_app_dmg. |
| 718 ['branding=="Chrome"', { | 719 ['branding=="Chrome"', { |
| 719 'dmg_name': 'GoogleChrome.dmg', | 720 'dmg_name': 'GoogleChrome.dmg', |
| 720 }, { # else: branding!="Chrome" | 721 }, { # else: branding!="Chrome" |
| 721 'dmg_name': 'Chromium.dmg', | 722 'dmg_name': 'Chromium.dmg', |
| 722 }], | 723 }], |
| 723 ], | 724 ], |
| 724 }, | 725 }, |
| 725 'actions': [ | 726 'actions': [ |
| 726 { | 727 { |
| 727 'inputs': [ | 728 'inputs': [ |
| 728 '<(build_app_dmg_script_path)', | 729 '<(build_app_dmg_script_path)', |
| 730 '<(pkg_dmg_script_path)', |
| 729 '<(PRODUCT_DIR)/<(mac_product_name).app', | 731 '<(PRODUCT_DIR)/<(mac_product_name).app', |
| 730 ], | 732 ], |
| 731 'outputs': [ | 733 'outputs': [ |
| 732 '<(PRODUCT_DIR)/<(dmg_name)', | 734 '<(PRODUCT_DIR)/<(dmg_name)', |
| 733 ], | 735 ], |
| 734 'action_name': 'build_app_dmg', | 736 'action_name': 'build_app_dmg', |
| 735 'action': ['<(build_app_dmg_script_path)', '<@(branding)'], | 737 'action': ['<(build_app_dmg_script_path)', '<@(branding)'], |
| 736 }, | 738 }, |
| 737 ], # 'actions' | 739 ], # 'actions' |
| 738 }, | 740 }, |
| (...skipping 437 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1176 'sources': [ | 1178 'sources': [ |
| 1177 'browser/safe_browsing/signature_util.h', | 1179 'browser/safe_browsing/signature_util.h', |
| 1178 'browser/safe_browsing/signature_util_win.cc', | 1180 'browser/safe_browsing/signature_util_win.cc', |
| 1179 'tools/safe_browsing/sb_sigutil.cc', | 1181 'tools/safe_browsing/sb_sigutil.cc', |
| 1180 ], | 1182 ], |
| 1181 }, | 1183 }, |
| 1182 ]}, # 'targets' | 1184 ]}, # 'targets' |
| 1183 ], # OS=="win" | 1185 ], # OS=="win" |
| 1184 ], # 'conditions' | 1186 ], # 'conditions' |
| 1185 } | 1187 } |
| OLD | NEW |