diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-31 22:36:38 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-31 22:36:38 +0000 |
| commit | 6245e3604f7dc2a80cdeacf46cdca7d63b14e31c (patch) | |
| tree | 32845662d51f504c7c16d6d0846cf7480aad5f07 /chrome/installer/mac | |
| parent | 0b3602d2bc7dd03b3ebce95b1aa7e888b6f65c82 (diff) | |
| download | chromium_src-6245e3604f7dc2a80cdeacf46cdca7d63b14e31c.zip chromium_src-6245e3604f7dc2a80cdeacf46cdca7d63b14e31c.tar.gz chromium_src-6245e3604f7dc2a80cdeacf46cdca7d63b14e31c.tar.bz2 | |
Remove plugin_carbon_interpose support from the signing scripts on the
trunk following r286893.
plugin_carbon_interpose needs to be signed when present and when signing
on 10.9. However, it's not present in Chrome 38 or later.
BUG=399276
R=rsesek@chromium.org
Review URL: https://codereview.chromium.org/432933002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@286906 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/mac')
| -rw-r--r-- | chrome/installer/mac/sign_app.sh.in | 15 | ||||
| -rw-r--r-- | chrome/installer/mac/sign_versioned_dir.sh.in | 15 |
2 files changed, 0 insertions, 30 deletions
diff --git a/chrome/installer/mac/sign_app.sh.in b/chrome/installer/mac/sign_app.sh.in index 326cb35..4738ed7 100644 --- a/chrome/installer/mac/sign_app.sh.in +++ b/chrome/installer/mac/sign_app.sh.in @@ -45,17 +45,6 @@ helper_app="${versioned_dir}/@MAC_PRODUCT_NAME@ Helper.app" helper_eh_app="${versioned_dir}/@MAC_PRODUCT_NAME@ Helper EH.app" helper_np_app="${versioned_dir}/@MAC_PRODUCT_NAME@ Helper NP.app" -# libplugin_carbon_interpose.dylib was removed in r280670, but it's still -# present on the 37.0.2062 branch (and earlier). Accounting for it here makes -# it easier to merge the fix for http://crbug.com/399276 to other branches. -# -# TODO(mark): Remove this plugin_carbon_interpose code on the trunk as soon -# as it lands. -plugin_carbon_interpose="${versioned_dir}/libplugin_carbon_interpose.dylib" -if [[ ! -e "${plugin_carbon_interpose}" ]]; then - plugin_carbon_interpose= -fi - requirement_string="\ designated => \ (identifier \"com.google.Chrome\" or identifier \"com.google.Chrome.canary\") \ @@ -73,7 +62,3 @@ codesign -v "${helper_app}" codesign -v "${helper_eh_app}" codesign -v "${helper_np_app}" codesign -v "${browser_app}" - -if [[ -n "${plugin_carbon_interpose}" ]]; then - codesign -v "${plugin_carbon_interpose}" -fi diff --git a/chrome/installer/mac/sign_versioned_dir.sh.in b/chrome/installer/mac/sign_versioned_dir.sh.in index beddbe2..cb29f23 100644 --- a/chrome/installer/mac/sign_versioned_dir.sh.in +++ b/chrome/installer/mac/sign_versioned_dir.sh.in @@ -45,17 +45,6 @@ helper_app="${versioned_dir}/@MAC_PRODUCT_NAME@ Helper.app" helper_eh_app="${versioned_dir}/@MAC_PRODUCT_NAME@ Helper EH.app" helper_np_app="${versioned_dir}/@MAC_PRODUCT_NAME@ Helper NP.app" -# libplugin_carbon_interpose.dylib was removed in r280670, but it's still -# present on the 37.0.2062 branch (and earlier). Accounting for it here makes -# it easier to merge the fix for http://crbug.com/399276 to other branches. -# -# TODO(mark): Remove this plugin_carbon_interpose code on the trunk as soon -# as it lands. -plugin_carbon_interpose="${versioned_dir}/libplugin_carbon_interpose.dylib" -if [[ ! -e "${plugin_carbon_interpose}" ]]; then - plugin_carbon_interpose= -fi - requirement_suffix="\ and certificate leaf = H\"85cee8254216185620ddc8851c7a9fc4dfe120ef\"\ " @@ -89,7 +78,3 @@ codesign -v "${framework}" codesign -v "${helper_app}" codesign -v "${helper_eh_app}" codesign -v "${helper_np_app}" - -if [[ -n "${plugin_carbon_interpose}" ]]; then - codesign -v "${plugin_carbon_interpose}" -fi |