| Index: chrome/chrome_installer.gypi
|
| diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi
|
| index 29a36f2248cd67785160b33377fdb475e393e041..891f7fe26d5d0569237147a88cd27ea9d70a84d2 100644
|
| --- a/chrome/chrome_installer.gypi
|
| +++ b/chrome/chrome_installer.gypi
|
| @@ -1093,40 +1093,6 @@
|
| },
|
| ], # 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': [
|
| {
|
|
|