platform_tools/ios/bin/ios_setup.sh - Issue 1879513002: iOS: Tweak xcodebuild location

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: platform_tools/ios/bin/ios_setup.sh

Issue 1879513002: iOS: Tweak xcodebuild location (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Use environment variable Created 4 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: platform_tools/ios/bin/ios_setup.sh

diff --git a/platform_tools/ios/bin/ios_setup.sh b/platform_tools/ios/bin/ios_setup.sh

index 7af4dec319f4d5699385f2dd8259a109f2b07ea7..a991c53c31eba99253bea5ba13f99b3b5540098f 100755

--- a/platform_tools/ios/bin/ios_setup.sh

+++ b/platform_tools/ios/bin/ios_setup.sh

@@ -41,11 +41,16 @@ if [[ -z "$SKIA_OUT" ]]; then

SKIA_OUT="$SKIA_SRC_DIR/out"

+# Location of XCode build products.

+if [[ -z "$XCODEBUILD" ]]; then

+ XCODEBUILD="${SKIA_SRC_DIR}/xcodebuild"

+fi

# Name of the iOS app.

IOS_APP=iOSShell.ipa

# Location of the compiled iOS code.

-IOS_OUT=${SKIA_SRC_DIR}/xcodebuild/${BUILDTYPE}-iphoneos

+IOS_OUT=${XCODEBUILD}/${BUILDTYPE}-iphoneos

# Location of the compiled iOS app.

IOS_APP_PATH=${IOS_OUT}/${IOS_APP}

« no previous file with comments | « no previous file | no next file » | no next file with comments »