Commit 4312c1f9 authored by Robert Sesek's avatar Robert Sesek Committed by Commit Bot

macOS Signing Scripts: Do not staple the AlertNotificationService.xpc bundle.

The signing bots run on 10.13, and the stapler usable on that macOS
version is not capable of stapling XPC bundles. This change should be
reverted after the bot is upgraded to 10.14.

Bug: 850199, 979725
Change-Id: I528c5ebe288742f8fd1e85bf6db4bcd67be383e8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1682207
Commit-Queue: Robert Sesek <rsesek@chromium.org>
Reviewed-by: default avatarMark Mentovai <mark@chromium.org>
Cr-Commit-Position: refs/heads/master@{#673497}
parent 21b3923e
......@@ -51,7 +51,10 @@ def _staple_chrome(paths, dist_config):
part_paths = [
part.path
for part in parts.values()
if part.path[-4:] in ('.app', '.xpc')
# TODO(https://crbug.com/979725): Reinstate .xpc bundle stapling once
# the signing environment is on a macOS release that supports
# Xcode 10.2 or newer.
if part.path[-4:] in ('.app',)
]
# Reverse-sort the paths so that more nested paths are stapled before
# less-nested ones.
......
......@@ -95,9 +95,6 @@ class TestPipelineHelpers(unittest.TestCase):
pipeline._staple_chrome(paths, dist.to_config(test_config.TestConfig()))
self.assertEqual(staple.mock_calls, [
mock.call(
'$W/App Product.app/Contents/Frameworks/Product Framework.framework/XPCServices/AlertNotificationService.xpc'
),
mock.call(
'$W/App Product.app/Contents/Frameworks/Product Framework.framework/Helpers/Product Helper.app'
),
......@@ -121,9 +118,6 @@ class TestPipelineHelpers(unittest.TestCase):
pipeline._staple_chrome(paths, dist.to_config(test_config.TestConfig()))
self.assertEqual(staple.mock_calls, [
mock.call(
'$W/App Product Canary.app/Contents/Frameworks/Product Framework.framework/XPCServices/AlertNotificationService.xpc'
),
mock.call(
'$W/App Product Canary.app/Contents/Frameworks/Product Framework.framework/Helpers/Product Helper.app'
),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment