diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-12 16:24:33 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-12 16:24:33 +0000 |
| commit | 77fd1b09ec4d3400e6e8f08a2e0036b325da15a4 (patch) | |
| tree | f692892d8654bc8236aac4758fe554b35f88287d /chrome/chrome_installer.gypi | |
| parent | cd56514d9a698e7c185fd1f4850e6c8d21df4d61 (diff) | |
| download | chromium_src-77fd1b09ec4d3400e6e8f08a2e0036b325da15a4.zip chromium_src-77fd1b09ec4d3400e6e8f08a2e0036b325da15a4.tar.gz chromium_src-77fd1b09ec4d3400e6e8f08a2e0036b325da15a4.tar.bz2 | |
Only copy keychain_reauthorize in official builds.
Review URL: https://chromiumcodereview.appspot.com/10534113
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141667 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_installer.gypi')
| -rw-r--r-- | chrome/chrome_installer.gypi | 66 |
1 files changed, 34 insertions, 32 deletions
diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi index 1b8cdc9..337611c 100644 --- a/chrome/chrome_installer.gypi +++ b/chrome/chrome_installer.gypi @@ -926,6 +926,40 @@ }, ], # actions }], # buildtype=="Official" + ['branding=="Chrome" and buildtype=="Official"', { + 'actions': [ + { + # copy_keychain_reauthorize.sh explains why this isn't in a + # 'copies' block, but briefly: this is a prebuilt signed + # binary component that relies on a correct signature to + # function properly, and a normal 'copies' block sadly makes + # a trivial modification to the file such that its signature + # is no longer valid. + 'action_name': 'Copy keychain_reauthorize', + 'variables': { + 'keychain_reauthorize_path': 'tools/build/mac/copy_keychain_reauthorize.sh', + 'keychain_reauthorize_normal_path': 'installer/mac/internal/keychain_reauthorize/com.google.Chrome', + 'keychain_reauthorize_canary_path': 'installer/mac/internal/keychain_reauthorize/com.google.Chrome.canary', + 'keychain_reauthorize_output_dir': '<(mac_packaging_dir)/.keychain_reauthorize', + }, + 'inputs': [ + '<(keychain_reauthorize_path)', + '<(keychain_reauthorize_normal_path)', + '<(keychain_reauthorize_canary_path)', + ], + 'outputs': [ + '<(keychain_reauthorize_output_dir)/com.google.Chrome', + '<(keychain_reauthorize_output_dir)/com.google.Chrome.canary', + ], + 'action': [ + '<(keychain_reauthorize_path)', + '<(keychain_reauthorize_output_dir)', + '<(keychain_reauthorize_normal_path)', + '<(keychain_reauthorize_canary_path)', + ], + }, + ], # actions + }], # branding=="Chrome" and buildtype=="Official" ], # conditions 'copies': [ { @@ -965,38 +999,6 @@ ], # conditions }, ], # copies - 'actions': [ - { - # copy_keychain_reauthorize.sh explains why this isn't in a - # 'copies' block, but briefly: this is a prebuilt signed binary - # component that relies on a correct signature to function - # properly, and a normal 'copies' block sadly makes a trivial - # modification to the file such that its signature is no longer - # valid. - 'action_name': 'Copy keychain_reauthorize', - 'variables': { - 'keychain_reauthorize_path': 'tools/build/mac/copy_keychain_reauthorize.sh', - 'keychain_reauthorize_normal_path': 'installer/mac/internal/keychain_reauthorize/com.google.Chrome', - 'keychain_reauthorize_canary_path': 'installer/mac/internal/keychain_reauthorize/com.google.Chrome.canary', - 'keychain_reauthorize_output_dir': '<(mac_packaging_dir)/.keychain_reauthorize', - }, - 'inputs': [ - '<(keychain_reauthorize_path)', - '<(keychain_reauthorize_normal_path)', - '<(keychain_reauthorize_canary_path)', - ], - 'outputs': [ - '<(keychain_reauthorize_output_dir)/com.google.Chrome', - '<(keychain_reauthorize_output_dir)/com.google.Chrome.canary', - ], - 'action': [ - '<(keychain_reauthorize_path)', - '<(keychain_reauthorize_output_dir)', - '<(keychain_reauthorize_normal_path)', - '<(keychain_reauthorize_canary_path)', - ], - }, - ], # actions }, # target: installer_packaging { 'target_name': 'gcapi_lib', |