diff options
| author |  Dmitry Shevchenko <dmishe@google.com> | 2016-07-27 21:19:35 +0000 |
|---|---|---|
| committer |  Adam Michael <ajmichael@google.com> | 2016-07-28 18:36:30 -0400 |
| commit | 47281b4a1e3be5077e13f5d2d1986c6105c26365 (patch) | |
| tree | b64390787a41c8f8b902e012d507648234a47176 /src/tools/xcode | |
| parent | 0e75edb5a314fd2b8b977432d534ebe4027da548 (diff) | |
Rollback of commit 75714b0d6e65905e41da8415ca3e7ec101575d51.
*** Reason for rollback ***
Broke Play Books tests
*** Original change description ***
Include SwiftSupport directory into the IPA when an app contains Swift.
* To pass App Store validation, an app that contains Swift code must have a SwiftSupport directory at the root of the IPA.
--
MOS_MIGRATED_REVID=128627984
Diffstat (limited to 'src/tools/xcode')
| -rwxr-xr-x | src/tools/xcode/swiftstdlibtoolwrapper/swiftstdlibtoolwrapper.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/tools/xcode/swiftstdlibtoolwrapper/swiftstdlibtoolwrapper.sh b/src/tools/xcode/swiftstdlibtoolwrapper/swiftstdlibtoolwrapper.sh index 311b123443..11879ccde0 100755 --- a/src/tools/xcode/swiftstdlibtoolwrapper/swiftstdlibtoolwrapper.sh +++ b/src/tools/xcode/swiftstdlibtoolwrapper/swiftstdlibtoolwrapper.sh @@ -26,12 +26,11 @@ REALPATH="${MY_LOCATION}/realpath" WRAPPER="${MY_LOCATION}/xcrunwrapper.sh" OUTZIP=$("${REALPATH}" "$1") -PATH_INSIDE_ZIP="${2:-"Frameworks"}" -shift 2 +shift 1 TEMPDIR=$(mktemp -d "${TMPDIR:-/tmp}/swiftstdlibtoolZippingOutput.XXXXXX") trap "rm -rf \"$TEMPDIR\"" EXIT -FULLPATH="$TEMPDIR/$PATH_INSIDE_ZIP" +FULLPATH="$TEMPDIR/Frameworks" $WRAPPER swift-stdlib-tool --copy --verbose --destination "$FULLPATH" "$@" |