Index: pylib/gyp/mac_tool.py |
diff --git a/pylib/gyp/mac_tool.py b/pylib/gyp/mac_tool.py |
index 82b5f0a70b0e9b00bfc7aab8369ecb469b010062..1ad1ae1e2a1ae3593e46f29c9795456f8d4e72b2 100755 |
--- a/pylib/gyp/mac_tool.py |
+++ b/pylib/gyp/mac_tool.py |
@@ -350,50 +350,26 @@ class MacTool(object): |
self._MergePlist(merged_plist, plist) |
plistlib.writePlist(merged_plist, output) |
- def ExecCodeSignBundle(self, key, resource_rules, entitlements, provisioning): |
+ def ExecCodeSignBundle(self, key, entitlements, provisioning): |
"""Code sign a bundle. |
This function tries to code sign an iOS bundle, following the same |
algorithm as Xcode: |
- 1. copy ResourceRules.plist from the user or the SDK into the bundle, |
- 2. pick the provisioning profile that best match the bundle identifier, |
+ 1. pick the provisioning profile that best match the bundle identifier, |
and copy it into the bundle as embedded.mobileprovision, |
- 3. copy Entitlements.plist from user or SDK next to the bundle, |
- 4. code sign the bundle. |
+ 2. copy Entitlements.plist from user or SDK next to the bundle, |
+ 3. code sign the bundle. |
""" |
- resource_rules_path = self._InstallResourceRules(resource_rules) |
substitutions, overrides = self._InstallProvisioningProfile( |
provisioning, self._GetCFBundleIdentifier()) |
entitlements_path = self._InstallEntitlements( |
entitlements, substitutions, overrides) |
subprocess.check_call([ |
- 'codesign', '--force', '--sign', key, '--resource-rules', |
- resource_rules_path, '--entitlements', entitlements_path, |
- os.path.join( |
+ 'codesign', '--force', '--sign', key, '--entitlements', |
+ entitlements_path, os.path.join( |
os.environ['TARGET_BUILD_DIR'], |
os.environ['FULL_PRODUCT_NAME'])]) |
- def _InstallResourceRules(self, resource_rules): |
- """Installs ResourceRules.plist from user or SDK into the bundle. |
- |
- Args: |
- resource_rules: string, optional, path to the ResourceRules.plist file |
- to use, default to "${SDKROOT}/ResourceRules.plist" |
- |
- Returns: |
- Path to the copy of ResourceRules.plist into the bundle. |
- """ |
- source_path = resource_rules |
- target_path = os.path.join( |
- os.environ['BUILT_PRODUCTS_DIR'], |
- os.environ['CONTENTS_FOLDER_PATH'], |
- 'ResourceRules.plist') |
- if not source_path: |
- source_path = os.path.join( |
- os.environ['SDKROOT'], 'ResourceRules.plist') |
- shutil.copy2(source_path, target_path) |
- return target_path |
- |
def _InstallProvisioningProfile(self, profile, bundle_identifier): |
"""Installs embedded.mobileprovision into the bundle. |