BUG=skia:

NOTRY=true
TBR=borenet

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

diff --git a/platform_tools/ios/bin/ios_ninja b/platform_tools/ios/bin/ios_ninja
index 55f30bb0f37fd78b5a4df0b16895134a0b7df26a..ff0a61dc0102ef39769f695f4bdf6048dd1d3bc8 100755 (executable)
--- 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 fc6386c6b3fc56a37280df9f0776caf28bb75728..d36da834e84463f4c9ea2491ad9709d96bd84f05 100755 (executable)
--- 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"
 }