diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-11 02:19:23 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-11 02:19:23 +0000 |
| commit | c8678d8870826350577c3f00e922e442abb647c9 (patch) | |
| tree | 9ba8426eac38f6f347e32a5dcc917f5fc73aba7a /chrome | |
| parent | 94e715503fa84149250d01f31cbc64a683b9cd55 (diff) | |
| download | chromium_src-c8678d8870826350577c3f00e922e442abb647c9.zip chromium_src-c8678d8870826350577c3f00e922e442abb647c9.tar.gz chromium_src-c8678d8870826350577c3f00e922e442abb647c9.tar.bz2 | |
Fix an input and the output of the build_app_dmg target for Google-branded builds.
BUG=none
TEST=build target 'all' with make or ninja doing an official build.
'build_app_dmg' doesn't complain about missing input out/Release/Chrome.app.
Review URL: http://codereview.chromium.org/10048013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131695 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/chrome.gyp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 05bdbb2..7a49253 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -712,15 +712,24 @@ ], 'variables': { 'build_app_dmg_script_path': 'tools/build/mac/build_app_dmg', + + 'conditions': [ + # This duplicates the output path from build_app_dmg. + ['branding=="Chrome"', { + 'dmg_name': 'GoogleChrome.dmg', + }, { # else: branding!="Chrome" + 'dmg_name': 'Chromium.dmg', + }], + ], }, 'actions': [ { 'inputs': [ '<(build_app_dmg_script_path)', - '<(PRODUCT_DIR)/<(branding).app', + '<(PRODUCT_DIR)/<(mac_product_name).app', ], 'outputs': [ - '<(PRODUCT_DIR)/<(branding).dmg', + '<(PRODUCT_DIR)/<(dmg_name)', ], 'action_name': 'build_app_dmg', 'action': ['<(build_app_dmg_script_path)', '<@(branding)'], |