diff options
| -rw-r--r-- | BUILD.gn | 12 | ||||
| -rw-r--r-- | gn/codesign_ios.py | 8 | ||||
| -rw-r--r-- | site/user/build.md | 12 |
3 files changed, 25 insertions, 7 deletions
@@ -62,6 +62,11 @@ declare_args() { } else { skia_use_vulkan = skia_vulkan_sdk != "" } + + if (is_ios) { + skia_ios_identity = ".*Google.*" + skia_ios_profile = "Google Development" + } } declare_args() { skia_tools_vulkan_header_dir = "" @@ -1083,8 +1088,11 @@ if (skia_enable_tools) { "$bundle_root_dir/_CodeSignature/CodeResources", "$bundle_root_dir/embedded.mobileprovision", ] - code_signing_args = - [ rebase_path("$bundle_root_dir", root_build_dir) ] + code_signing_args = [ + rebase_path("$bundle_root_dir", root_build_dir), + skia_ios_identity, + skia_ios_profile, + ] } } } else { diff --git a/gn/codesign_ios.py b/gn/codesign_ios.py index 66a97d39ee..beb3603b04 100644 --- a/gn/codesign_ios.py +++ b/gn/codesign_ios.py @@ -16,12 +16,14 @@ import tempfile # Arguments to the script: # pkg path to application directory, e.g. out/Debug/dm.app # executable and plist should already be in this directory -pkg, = sys.argv[1:] +# identstr search string (regex fragment) for code signing identity +# profile name of provisioning profile +pkg,identstr,profile = sys.argv[1:] # Find the Google signing identity. identity = None for line in subprocess.check_output(['security', 'find-identity']).split('\n'): - m = re.match(r'''.*\) (.*) ".*Google.*"''', line) + m = re.match(r'''.*\) (.*) "''' + identstr + '"', line) if m: identity = m.group(1) assert identity @@ -31,7 +33,7 @@ mobileprovision = None for p in glob.glob(os.path.join(os.environ['HOME'], 'Library', 'MobileDevice', 'Provisioning Profiles', '*.mobileprovision')): if re.search(r'''<key>Name</key> -\t<string>Google Development</string>''', open(p).read(), re.MULTILINE): +\t<string>''' + profile + r'''</string>''', open(p).read(), re.MULTILINE): mobileprovision = p assert mobileprovision diff --git a/site/user/build.md b/site/user/build.md index ce5edbafc3..4d5600579f 100644 --- a/site/user/build.md +++ b/site/user/build.md @@ -205,8 +205,12 @@ This defaults to `target_cpu="arm64"`. Choosing `x64` targets the iOS simulator bin/gn gen out/ios32 --args='target_os="ios" target_cpu="arm"' bin/gn gen out/iossim --args='target_os="ios" target_cpu="x64"' -This will also package (and for devices, sign) iOS test binaries. For the moment a -Google provisioning profile is needed to sign. +This will also package (and for devices, sign) iOS test binaries. This defaults to a +Google signing identity and provisioning profile. To use a different one set `skia_ios_identity` +to match your code signing identity and `skia_ios_profile` to the name of your provisioning +profile, e.g. `skia_ios_identity=".*Jane Doe.*" skia_ios_profile="iPad Profile"`. A list of +identities can be found by typing `security find-identity` on the command line. The name of the +provisioning profile should be available on the Apple Developer site. For signed packages `ios-deploy` makes installing and running them on a device easy: @@ -217,6 +221,10 @@ Alternatively you can generate an Xcode project by passing `--ide=xcode` to `bin If you find yourself missing a Google signing identity or provisioning profile, you'll want to have a read through go/appledev. +Deploying to a device with an OS older than the current SDK doesn't currently work through Xcode, +but can be done on the command line by setting the environment variable IPHONEOS_DEPLOYMENT_TARGET +to the desired OS version. + Windows ------- |