More iOS swarming bot fixes

- Copy the packaged app into xcodebuild/...
- Isolate ios/bin directory

BUG=skia:5155
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1860333002

Review URL: https://codereview.chromium.org/1860333002

5 files changed, 19 insertions, 4 deletions

diff --git a/infra/bots/ios_bin.isolate b/infra/bots/ios_bin.isolate
new file mode 100644
index 0000000000..b6fc135a42
--- /dev/null
+++ b/infra/bots/ios_bin.isolate
@@ -0,0 +1,11 @@
+{
+  'conditions': [
+    ['OS=="iOS-9.2"', {
+      'variables': {
+        'files': [
+          '../../platform_tools/ios/bin/',
+        ],
+      },
+    }],
+  ],
+}
diff --git a/infra/bots/perf_skia.isolate b/infra/bots/perf_skia.isolate
index 3412ec40ff..d98741c07d 100644
--- a/infra/bots/perf_skia.isolate
+++ b/infra/bots/perf_skia.isolate
@@ -3,6 +3,7 @@
     'android_bin.isolate',
     'images.isolate',
     'infrabots.isolate',
+    'ios_bin.isolate',
     'resources.isolate',
     'skps.isolate',
   ],
diff --git a/infra/bots/test_skia.isolate b/infra/bots/test_skia.isolate
index 3412ec40ff..d98741c07d 100644
--- a/infra/bots/test_skia.isolate
+++ b/infra/bots/test_skia.isolate
@@ -3,6 +3,7 @@
     'android_bin.isolate',
     'images.isolate',
     'infrabots.isolate',
+    'ios_bin.isolate',
     'resources.isolate',
     'skps.isolate',
   ],
diff --git a/platform_tools/ios/bin/ios_run_skia b/platform_tools/ios/bin/ios_run_skia
index 248593a66e..2b7861b08e 100755
--- a/platform_tools/ios/bin/ios_run_skia
+++ b/platform_tools/ios/bin/ios_run_skia
@@ -15,6 +15,6 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 source $SCRIPT_DIR/ios_setup.sh
 
 # Run the application.
-IOS_DEPLOY_ARGS="${SKIA_SRC_DIR}/xcodebuild/${BUILDTYPE}-iphoneos/iOSShell.app --args \"${*}\""
+IOS_DEPLOY_ARGS="${IOS_OUT}/iOSShell.app --args \"${*}\""
 CMD="ios-deploy -I -m -b ${IOS_DEPLOY_ARGS}"
 eval $CMD
diff --git a/platform_tools/ios/bin/ios_setup.sh b/platform_tools/ios/bin/ios_setup.sh
index 49a2228192..7af4dec319 100755
--- a/platform_tools/ios/bin/ios_setup.sh
+++ b/platform_tools/ios/bin/ios_setup.sh
@@ -44,9 +44,11 @@ fi
 # Name of the iOS app.
 IOS_APP=iOSShell.ipa
 
-# Location of the compiled iOS app.
-IOS_APP_PATH=${SKIA_OUT}/${BUILDTYPE}/${IOS_APP}
+# Location of the compiled iOS code.
+IOS_OUT=${SKIA_SRC_DIR}/xcodebuild/${BUILDTYPE}-iphoneos
 
+# Location of the compiled iOS app.
+IOS_APP_PATH=${IOS_OUT}/${IOS_APP}
 
 ios_uninstall_app() {
   ideviceinstaller -U "$IOS_BUNDLE_ID"
@@ -55,7 +57,7 @@ ios_uninstall_app() {
 ios_package_app() {
   rm -rf $IOS_PCKG_DIR
   mkdir -p $IOS_PCKG_DIR/Payload  # this directory must be named 'Payload'
-  cp -rf "${SKIA_SRC_DIR}/xcodebuild/${BUILDTYPE}-iphoneos/iOSShell.app" "${IOS_PCKG_DIR}/Payload/"
+  cp -rf "${IOS_OUT}/iOSShell.app" "${IOS_PCKG_DIR}/Payload/"
   pushd $IOS_PCKG_DIR
   zip -r ${IOS_APP} Payload
   cp ${IOS_APP} ${IOS_APP_PATH}