| OLD | NEW |
| 1 #!/bin/bash | 1 #!/bin/bash |
| 2 ############################################################################### | 2 ############################################################################### |
| 3 # Copyright 2015 Google Inc. | 3 # Copyright 2015 Google Inc. |
| 4 # | 4 # |
| 5 # Use of this source code is governed by a BSD-style license that can be | 5 # Use of this source code is governed by a BSD-style license that can be |
| 6 # found in the LICENSE file. | 6 # found in the LICENSE file. |
| 7 ############################################################################### | 7 ############################################################################### |
| 8 # | 8 # |
| 9 # ios_setup.sh: Sets environment variables used by other iOS scripts. | 9 # ios_setup.sh: Sets environment variables used by other iOS scripts. |
| 10 | 10 |
| (...skipping 21 matching lines...) Expand all Loading... |
| 32 | 32 |
| 33 IOS_BUNDLE_ID="com.google.iOSShell" | 33 IOS_BUNDLE_ID="com.google.iOSShell" |
| 34 | 34 |
| 35 IOS_RESULTS_DIR="results" | 35 IOS_RESULTS_DIR="results" |
| 36 | 36 |
| 37 # BUILDTYPE is 'Debug' by default. | 37 # BUILDTYPE is 'Debug' by default. |
| 38 if [[ -z "$BUILDTYPE" ]]; then | 38 if [[ -z "$BUILDTYPE" ]]; then |
| 39 BUILDTYPE="Debug" | 39 BUILDTYPE="Debug" |
| 40 fi | 40 fi |
| 41 | 41 |
| 42 # Out dir is $SKIA_SRC_DIR/out by default. |
| 43 if [[ -z "$SKIA_OUT" ]]; then |
| 44 SKIA_OUT="$SKIA_SRC_DIR/out" |
| 45 fi |
| 46 |
| 42 ios_uninstall_app() { | 47 ios_uninstall_app() { |
| 43 ideviceinstaller -U "$IOS_BUNDLE_ID" | 48 ideviceinstaller -U "$IOS_BUNDLE_ID" |
| 44 } | 49 } |
| 45 | 50 |
| 46 ios_install_app() { | 51 ios_install_app() { |
| 47 rm -rf $IOS_PCKG_DIR | 52 rm -rf $IOS_PCKG_DIR |
| 48 mkdir -p $IOS_PCKG_DIR/Payload # this directory must be named 'Payload' | 53 mkdir -p $IOS_PCKG_DIR/Payload # this directory must be named 'Payload' |
| 49 cp -rf "${SKIA_SRC_DIR}/xcodebuild/${BUILDTYPE}-iphoneos/iOSShell.app" "${IOS_
PCKG_DIR}/Payload/" | 54 cp -rf "${SKIA_SRC_DIR}/xcodebuild/${BUILDTYPE}-iphoneos/iOSShell.app" "${IOS_
PCKG_DIR}/Payload/" |
| 50 local RET_DIR=`pwd` | 55 local RET_DIR=`pwd` |
| 51 cd $IOS_PCKG_DIR | 56 cd $IOS_PCKG_DIR |
| (...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 179 # adb_push_if_needed $HOST_SRC $ANDROID_DST | 184 # adb_push_if_needed $HOST_SRC $ANDROID_DST |
| 180 # else | 185 # else |
| 181 # echo -n "$ANDROID_DST " | 186 # echo -n "$ANDROID_DST " |
| 182 # $ADB $DEVICE_SERIAL shell mkdir -p "$(dirname "$ANDROID_DST")" | 187 # $ADB $DEVICE_SERIAL shell mkdir -p "$(dirname "$ANDROID_DST")" |
| 183 # $ADB $DEVICE_SERIAL push $HOST_SRC $ANDROID_DST | 188 # $ADB $DEVICE_SERIAL push $HOST_SRC $ANDROID_DST |
| 184 # fi | 189 # fi |
| 185 # fi | 190 # fi |
| 186 # } | 191 # } |
| 187 | 192 |
| 188 # setup_device "${DEVICE_ID}" | 193 # setup_device "${DEVICE_ID}" |
| OLD | NEW |