aboutsummaryrefslogtreecommitdiffhomepage
path: root/platform_tools
diff options
context:
space:
mode:
authorGravatar Mike Klein <mtklein@chromium.org>2017-02-03 13:31:05 -0500
committerGravatar Mike Klein <mtklein@chromium.org>2017-02-03 19:26:55 +0000
commite0b048cd1d9772847d6f08bccb5b85133a41fc98 (patch)
tree937c8c974aecf4aac7a1e1074f45ed7aa1262086 /platform_tools
parent8d3ffad8116b53b26483195e651a8c34857b3061 (diff)
iOS: set up device dirs to be relative
Hopefully this get things pushed to and reading from directories under com.google.dm's Documents. I've hardcoded to DM's app for now. CQ_INCLUDE_TRYBOTS=skia.primary:Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release Change-Id: Iea54b3604b65551e4a486b50d6c7ea9aba26f869 Reviewed-on: https://skia-review.googlesource.com/8004 Reviewed-by: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'platform_tools')
-rwxr-xr-xplatform_tools/ios/bin/ios_setup.sh13
1 files changed, 7 insertions, 6 deletions
diff --git a/platform_tools/ios/bin/ios_setup.sh b/platform_tools/ios/bin/ios_setup.sh
index 0a56d9152b..1acc03b7c1 100755
--- a/platform_tools/ios/bin/ios_setup.sh
+++ b/platform_tools/ios/bin/ios_setup.sh
@@ -27,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.dm"
IOS_RESULTS_DIR="results"
@@ -36,10 +36,10 @@ if [[ -z "$BUILDTYPE" ]]; then
BUILDTYPE="Debug"
fi
-# Out dir is $SKIA_SRC_DIR/out by default.
-if [[ -z "$SKIA_OUT" ]]; then
+# Out dir is $SKIA_SRC_DIR/out by default.
+if [[ -z "$SKIA_OUT" ]]; then
SKIA_OUT="$SKIA_SRC_DIR/out"
-fi
+fi
# Location of XCode build products.
if [[ -z "$XCODEBUILD" ]]; then
@@ -101,7 +101,7 @@ ios_mount() {
# If this is already mounted we unmount it.
if $(mount | grep --quiet "$IOS_MOUNT_POINT"); then
>&2 echo "Device already mounted at: $IOS_MOUNT_POINT - Unmounting."
- ios_umount || true
+ ios_umount || true
fi
# Ensure there is a mount directory.
@@ -111,6 +111,7 @@ ios_mount() {
ifuse --container $IOS_BUNDLE_ID $IOS_MOUNT_POINT
sleep 1
>&2 echo "Successfully mounted device."
+ #find $IOS_MOUNT_POINT
}
# ios_umount: unmounts the ios device.
@@ -121,7 +122,7 @@ ios_umount() {
# ios_restart: restarts the iOS device.
ios_restart() {
- ios_umount || true
+ ios_umount || true
idevicediagnostics restart
}