From a633d3e32065961f0bb58c5637c878e391024494 Mon Sep 17 00:00:00 2001 From: Toby Date: Sun, 29 Oct 2023 15:49:03 -0700 Subject: [PATCH] ci: try to fix android builds --- .github/workflows/master.yml | 2 +- .github/workflows/release.yml | 2 +- hyperbole.py | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 36130d4..d5f7e50 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -29,7 +29,7 @@ jobs: - uses: nttld/setup-ndk@v1 id: setup-ndk with: - ndk-version: r25b + ndk-version: r26b add-to-path: false local-cache: true diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 13b50ad..331087e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -33,7 +33,7 @@ jobs: - uses: nttld/setup-ndk@v1 id: setup-ndk with: - ndk-version: r25b + ndk-version: r26b add-to-path: false local-cache: true diff --git a/hyperbole.py b/hyperbole.py index ab57796..978ef8c 100755 --- a/hyperbole.py +++ b/hyperbole.py @@ -217,13 +217,13 @@ def cmd_build(pprof=False, release=False, race=False): + "/toolchains/llvm/prebuilt/linux-x86_64/bin" ) if arch == "arm64": - env["CC"] = ANDROID_NDK_HOME + "/aarch64-linux-android33-clang" + env["CC"] = ANDROID_NDK_HOME + "/aarch64-linux-android29-clang" elif arch == "armv7": - env["CC"] = ANDROID_NDK_HOME + "/armv7a-linux-androideabi33-clang" + env["CC"] = ANDROID_NDK_HOME + "/armv7a-linux-androideabi29-clang" elif arch == "386": - env["CC"] = ANDROID_NDK_HOME + "/i686-linux-android33-clang" + env["CC"] = ANDROID_NDK_HOME + "/i686-linux-android29-clang" elif arch == "amd64": - env["CC"] = ANDROID_NDK_HOME + "/x86_64-linux-android33-clang" + env["CC"] = ANDROID_NDK_HOME + "/x86_64-linux-android29-clang" else: print("Unsupported arch for android: %s" % arch) return @@ -257,7 +257,7 @@ def cmd_build(pprof=False, release=False, race=False): subprocess.check_call(cmd, env=env) except Exception: print("Failed to build for %s/%s" % (os_name, arch)) - return + sys.exit(1) print("Built %s" % out_name)