Skip to content

Commit a628972

Browse files
committed
Android SDK build
1 parent e0e98ba commit a628972

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

.github/workflows/pull_request.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ jobs:
99
build:
1010
name: Build Docker images
1111
runs-on: ubuntu-latest
12+
if: false
1213
steps:
1314
- name: Checkout repository
1415
uses: actions/checkout@v4
@@ -41,5 +42,7 @@ jobs:
4142
uses: actions/checkout@v4
4243
- name: Build Android SDK
4344
working-directory: swift-ci/sdks/android
44-
run: ./build
45+
run: |
46+
apt install ninja-build
47+
./build
4548

swift-ci/sdks/android/build

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
# the architecture(s) to build
55
ARCH=aarch64
66
#ARCH=x86_64,aarch64
7+
NDK=android-ndk-r27c
8+
API=28
79

810
SDKROOT=${TMPDIR:-/tmp}/swift-android-sdk
911
mkdir -p ${SDKROOT}
@@ -19,7 +21,7 @@ HOST_TOOLCHAIN=${HOST_TOOLCHAIN:-$(dirname $(dirname $(which swiftc)))}
1921

2022
${HOST_TOOLCHAIN}/bin/swift --version
2123

22-
export ANDROID_NDK_HOME=${SDKROOT}/ndk/android-ndk-r27c
24+
export ANDROID_NDK_HOME=${SDKROOT}/ndk/${NDK}
2325
export ANDROID_NDK=${ANDROID_NDK_HOME}
2426

2527
if [[ ! -d ${ANDROID_NDK_HOME} ]]; then
@@ -42,5 +44,5 @@ if [[ ! -d ${SDKROOT}/src ]]; then
4244
./scripts/fetch-source.sh --source-dir ${SDKROOT}/src
4345
fi
4446

45-
./scripts/build.sh --patch-dir ${PATCHDIR} --products-dir ${SDKROOT}/products --source-dir ${SDKROOT}/src --build-dir ${SDKROOT}/build --ndk-home ${ANDROID_NDK_HOME} --host-toolchain ${HOST_TOOLCHAIN} --archs $ARCH
47+
./scripts/build.sh --patch-dir ${PATCHDIR} --products-dir ${SDKROOT}/products --source-dir ${SDKROOT}/src --build-dir ${SDKROOT}/build --ndk-home ${ANDROID_NDK_HOME} --android-api ${API} --host-toolchain ${HOST_TOOLCHAIN} --archs $ARCH
4648

0 commit comments

Comments
 (0)