Commit 280e8aa1 authored by Yves Gerey's avatar Yves Gerey Committed by Commit Bot

Revert submission

Reason for revert: Breaks iOS WebRTC bots.

Change-Id: Ib85d9865dee9fb70637fa0e48e52a5ce3d45e649
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1929219Reviewed-by: default avatarSylvain Defresne <sdefresne@chromium.org>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#717670}
parent 1dd96a5f
...@@ -240,7 +240,7 @@ def CodeSignBundle(bundle_path, identity, extra_args): ...@@ -240,7 +240,7 @@ def CodeSignBundle(bundle_path, identity, extra_args):
def InstallSystemFramework(framework_path, bundle_path, args): def InstallSystemFramework(framework_path, bundle_path, args):
"""Install framework from |framework_path| to bundle at |bundle_path|.""" """Install framework from |framework_path| to |bundle| and code-re-sign it."""
installed_framework_path = os.path.join( installed_framework_path = os.path.join(
bundle_path, 'Frameworks', os.path.basename(framework_path)) bundle_path, 'Frameworks', os.path.basename(framework_path))
...@@ -251,19 +251,9 @@ def InstallSystemFramework(framework_path, bundle_path, args): ...@@ -251,19 +251,9 @@ def InstallSystemFramework(framework_path, bundle_path, args):
shutil.rmtree(installed_framework_path) shutil.rmtree(installed_framework_path)
shutil.copytree(framework_path, installed_framework_path) shutil.copytree(framework_path, installed_framework_path)
CodeSignBundle(installed_framework_path, args.identity,
def CodeSignPrivateFramework(framework_path, args):
"""Code sign a private framework (i.e. installed in Frameworks/ directory)."""
CodeSignBundle(framework_path, args.identity,
['--deep', '--preserve-metadata=identifier,entitlements,flags']) ['--deep', '--preserve-metadata=identifier,entitlements,flags'])
def CodeSignAllPrivateFrameworks(bundle_path, args):
"""Code sign all private frameworks of bundle at |bundle_path|."""
private_framework_dir = os.path.join(bundle_path, 'Frameworks')
private_framework_glob = os.path.join(private_framework_dir, '*.framework')
for framework_path in glob.glob(private_framework_glob):
CodeSignPrivateFramework(framework_path, args)
def GenerateEntitlements(path, provisioning_profile, bundle_identifier): def GenerateEntitlements(path, provisioning_profile, bundle_identifier):
"""Generates an entitlements file. """Generates an entitlements file.
...@@ -418,9 +408,6 @@ class CodeSignBundleAction(Action): ...@@ -418,9 +408,6 @@ class CodeSignBundleAction(Action):
for framework_path in args.frameworks: for framework_path in args.frameworks:
InstallSystemFramework(framework_path, args.path, args) InstallSystemFramework(framework_path, args.path, args)
# Code sign all private frameworks.
CodeSignAllPrivateFrameworks(args.path, args)
# Copy main binary into bundle. # Copy main binary into bundle.
if os.path.isfile(bundle.binary_path): if os.path.isfile(bundle.binary_path):
os.unlink(bundle.binary_path) os.unlink(bundle.binary_path)
......
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