Skip to content

Commit 234ca95

Browse files
committed
Android SDK build
1 parent 200025d commit 234ca95

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

swift-ci/sdks/android/build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ fi
1111
ANDROID_NDK_VERSION=android-ndk-r27c
1212
ANDROID_API=28
1313

14-
SDKROOT=${TMPDIR:-/tmp}/swift-android-sdk
14+
SDKROOT=${RUNNER_TEMP:-${TMPDIR:-'/tmp'}}/swift-android-sdk
1515
mkdir -p ${SDKROOT}
1616

1717
# Install a Swift host toolchain if it isn't already present

swift-ci/sdks/android/scripts/build.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -328,9 +328,6 @@ for arch in $archs; do
328328

329329
header "Building Android SDK for ${compiler_target_host}"
330330
quiet_pushd ${source_dir}/swift-project
331-
# TODO: only for release (for some reason)
332-
LSP_BUILD="--sourcekit-lsp"
333-
334331
build_type_flag="--debug"
335332
case $build_type in
336333
Debug) build_type_flag="--debug" ;;
@@ -360,12 +357,12 @@ for arch in $archs; do
360357
--install-libdispatch \
361358
--install-foundation \
362359
--xctest --install-xctest \
363-
$LSP_BUILD \
364360
--swift-testing --install-swift-testing \
365361
--cross-compile-append-host-target-to-destdir=False
366362

367363
#--llbuild --install-llbuild \
368364
#--swiftpm \
365+
#--sourcekit-lsp \
369366

370367
#--extra-cmake-options="-DCMAKE_HAVE_LIBC_PTHREAD=YES" \
371368
#--extra-cmake-options="-DTHREADS_PREFER_PTHREAD_FLAG=OFF" \

0 commit comments

Comments
 (0)