From c9b8276bc9775442c429c7c0d803c88a5aa2dd78 Mon Sep 17 00:00:00 2001 From: stephana Date: Fri, 22 May 2015 10:55:32 -0700 Subject: BUG=skia: NOTRY=true TBR=borenet Review URL: https://codereview.chromium.org/1153783003 --- platform_tools/ios/bin/ios_ninja | 3 +-- platform_tools/ios/bin/ios_setup.sh | 5 +++++ 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'platform_tools/ios') diff --git a/platform_tools/ios/bin/ios_ninja b/platform_tools/ios/bin/ios_ninja index 55f30bb0f3..ff0a61dc01 100755 --- a/platform_tools/ios/bin/ios_ninja +++ b/platform_tools/ios/bin/ios_ninja @@ -17,6 +17,5 @@ source $SCRIPT_DIR/ios_setup.sh OLD_DIR=`pwd` cd ${SKIA_SRC_DIR} "${SKIA_SRC_DIR}/gyp_skia" -xcodebuild -project "$SKIA_SRC_DIR/out/gyp/iOSShell.xcodeproj"\ - -configuration "$BUILDTYPE" +xcodebuild -project "$SKIA_OUT/gyp/iOSShell.xcodeproj" -configuration "$BUILDTYPE" cd $OLD_DIR diff --git a/platform_tools/ios/bin/ios_setup.sh b/platform_tools/ios/bin/ios_setup.sh index fc6386c6b3..d36da834e8 100755 --- a/platform_tools/ios/bin/ios_setup.sh +++ b/platform_tools/ios/bin/ios_setup.sh @@ -39,6 +39,11 @@ if [[ -z "$BUILDTYPE" ]]; then BUILDTYPE="Debug" fi +# Out dir is $SKIA_SRC_DIR/out by default. +if [[ -z "$SKIA_OUT" ]]; then + SKIA_OUT="$SKIA_SRC_DIR/out" +fi + ios_uninstall_app() { ideviceinstaller -U "$IOS_BUNDLE_ID" } -- cgit v1.2.3