More iOS swarming bot fixes

platform_tools/ios/bin/ios_setup.sh

 #!/bin/bash
 ###############################################################################
 # Copyright 2015 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 ###############################################################################
 #
 # ios_setup.sh: Sets environment variables used by other iOS scripts.
 
@@ skipping 26 matching lines @@
 fi
 
 # Out dir is $SKIA_SRC_DIR/out by default. 
 if [[ -z "$SKIA_OUT" ]]; then 
   SKIA_OUT="$SKIA_SRC_DIR/out"
 fi 
 
 # Name of the iOS app.
 IOS_APP=iOSShell.ipa
 
+# Location of the compiled iOS code.
+IOS_OUT=${SKIA_SRC_DIR}/xcodebuild/${BUILDTYPE}-iphoneos
+
 # Location of the compiled iOS app.
-IOS_APP_PATH=${SKIA_OUT}/${BUILDTYPE}/${IOS_APP}
-
+IOS_APP_PATH=${IOS_OUT}/${IOS_APP}
 
 ios_uninstall_app() {
   ideviceinstaller -U "$IOS_BUNDLE_ID"
 }
 
 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}
   popd
 }
 
 ios_install_app() {
   ideviceinstaller -i ${IOS_APP_PATH}
 }
 
@@ skipping 122 matching lines @@
 #       adb_push_if_needed $HOST_SRC $ANDROID_DST
 #     else
 #       echo -n "$ANDROID_DST "
 #       $ADB $DEVICE_SERIAL shell mkdir -p "$(dirname "$ANDROID_DST")"
 #       $ADB $DEVICE_SERIAL push $HOST_SRC $ANDROID_DST
 #     fi
 #   fi
 # }
 
 # setup_device "${DEVICE_ID}"