From c60b310af7635204b8186c616ffdd190d8bf5fe1 Mon Sep 17 00:00:00 2001
From: stephana <stephana@google.com>
Date: Wed, 2 Dec 2015 09:45:30 -0800
Subject: [PATCH] Modify iOSShell-gyp to generate unique bundle identifier

BUG=skia:

Review URL: https://codereview.chromium.org/1483143002
---
 experimental/iOSShell/iOSShell-Info.plist | 2 +-
 gyp/iOSShell.gyp                          | 1 +
 platform_tools/ios/bin/ios_setup.sh       | 7 ++-----
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/experimental/iOSShell/iOSShell-Info.plist b/experimental/iOSShell/iOSShell-Info.plist
index 69b62efd1..7f1a82765 100644
--- a/experimental/iOSShell/iOSShell-Info.plist
+++ b/experimental/iOSShell/iOSShell-Info.plist
@@ -11,7 +11,7 @@
 	<key>CFBundleIconFile</key>
 	<string></string>
 	<key>CFBundleIdentifier</key>
-	<string>com.google.iOSShell</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
diff --git a/gyp/iOSShell.gyp b/gyp/iOSShell.gyp
index 3f3acdc10..2ec50dbf3 100644
--- a/gyp/iOSShell.gyp
+++ b/gyp/iOSShell.gyp
@@ -68,6 +68,7 @@
             '../src/views/mac',
           ],
           'xcode_settings' : {
+            'PRODUCT_BUNDLE_IDENTIFIER' : '<!(echo com.google.iOSShell.`hostname | md5`)',
             'INFOPLIST_FILE' : '../experimental/iOSShell/iOSShell-Info.plist',
           },
           'xcode_config_file': '../experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig',
diff --git a/platform_tools/ios/bin/ios_setup.sh b/platform_tools/ios/bin/ios_setup.sh
index 53a33c67b..dbfed7c26 100755
--- a/platform_tools/ios/bin/ios_setup.sh
+++ b/platform_tools/ios/bin/ios_setup.sh
@@ -18,9 +18,6 @@ IOS_DOCS_DIR="Documents"
 # Temporary location to assemble the app into an .ipa package.
 IOS_PCKG_DIR="/tmp/ios_pckg"
 
-# Bundle id of the app that runs the tests.
-TEST_RUNNER_BUNDLE_ID="com.google.iOSShell"
-
 # Directory with the Skia source.
 SKIA_SRC_DIR=$(cd "${SCRIPT_DIR}/../../.."; pwd)
 
@@ -30,7 +27,7 @@ PROVISIONING_PROFILE=""
 # Code Signing identity - this needs to be set up on the local machine.
 CODE_SIGN_IDENTITY="iPhone Developer"
 
-IOS_BUNDLE_ID="com.google.iOSShell"
+IOS_BUNDLE_ID="com.google.iOSShell.`hostname | md5`"
 
 IOS_RESULTS_DIR="results"
 
@@ -94,7 +91,7 @@ ios_mount() {
   if [[ ! -d "$IOS_MOUNT_POINT" ]]; then
     mkdir -p $IOS_MOUNT_POINT
   fi
-  ifuse --container $TEST_RUNNER_BUNDLE_ID $IOS_MOUNT_POINT
+  ifuse --container $IOS_BUNDLE_ID $IOS_MOUNT_POINT
   sleep 1
   >&2 echo "Successfully mounted device."
 }