Skip to content

Commit

Permalink
provisioning profile and entitlement support on mac
Browse files Browse the repository at this point in the history
This was added upstream which ended up breaking the the signing scripts
and caused the osx build to not start.

We might be ok reverting the changes if necessary like in
faed762
but i'd prefer to not worry about what that might break down the line.

Upstream signing changes:
https://chromium.googlesource.com/chromium/src.git/+/4d80b33e7c64069cb69041c4957ea77ecf6e14e8

Original more descriptive but reverted commit:
https://chromium.googlesource.com/chromium/src.git/+/b69d8c48da838196d9655402dd739e62227762a7
  • Loading branch information
RyanJarv committed Aug 11, 2018
1 parent 8146e3c commit 43a9802
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
4 changes: 3 additions & 1 deletion build/mac/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ action("sign_app") {

script = "//build/gn_run_binary.py"
shell_script = "//brave/build/mac/sign_app.sh"
provisioning_profile = "//brave/build/mac/$brave_channel.provisionprofile"

inputs = [
shell_script,
Expand All @@ -33,7 +34,8 @@ action("sign_app") {
rebase_path(_target_app_path),
rebase_path(_packaging_dir),
keychain_db,
mac_signing_identifier
mac_signing_identifier,
provisioning_profile,
]
deps = [
"//brave:chrome_app",
Expand Down
Binary file added build/mac/dev.provisionprofile
Binary file not shown.
7 changes: 3 additions & 4 deletions build/mac/sign_app.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -euo pipefail

if [[ $# -lt "4" ]]; then
echo "usage: $0 <source_app> <dest_app> <packaging_dir> <mac_signing_keychain> <mac_signing_identifier>"
echo "usage: $0 <source_app> <dest_app> <packaging_dir> <mac_signing_keychain> <mac_signing_identifier> <mac_provisioning_profile>"
exit 1
fi

Expand All @@ -12,11 +12,10 @@ DEST="${2}"
PKG_DIR="${3}"
MAC_SIGNING_KEYCHAIN="${4}"
MAC_SIGNING_IDENTIFIER="${5}"
MAC_PROVISIONING_PROFILE="${6}"

app_name="$(basename $SOURCE)"

set -v

function check_exit() {
return=$?;
if [[ $return -eq 0 ]]; then
Expand All @@ -40,4 +39,4 @@ cp -a "$SOURCE" "$DEST"

"${PKG_DIR}/sign_versioned_dir.sh" "$DEST" "$MAC_SIGNING_KEYCHAIN" "$MAC_SIGNING_IDENTIFIER"

"${PKG_DIR}/sign_app.sh" "$DEST" "$MAC_SIGNING_KEYCHAIN" "$MAC_SIGNING_IDENTIFIER"
"${PKG_DIR}/sign_app.sh" "$DEST" "$MAC_SIGNING_KEYCHAIN" "$MAC_SIGNING_IDENTIFIER" "$MAC_PROVISIONING_PROFILE" "${PKG_DIR}/entitlements.plist"

0 comments on commit 43a9802

Please sign in to comment.