mirrors/hysteria
1
0
Fork 0
mirror of https://github.com/apernet/hysteria.git synced 2025-04-03 20:47:38 +03:00
Code Issues Projects Releases Packages Wiki Activity

ci: try to fix android builds

Browse source
This commit is contained in:
Toby 2023-10-29 15:49:03 -07:00
parent e6cb3df546
commit a633d3e320
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/master.yml vendored
View file

@ -29,7 +29,7 @@ jobs:
- uses: nttld/setup-ndk@v1 - uses: nttld/setup-ndk@v1
id: setup-ndk id: setup-ndk
with: with:
ndk-version: r25b ndk-version: r26b
add-to-path: false add-to-path: false
local-cache: true local-cache: true

2
.github/workflows/release.yml vendored
View file

@ -33,7 +33,7 @@ jobs:
- uses: nttld/setup-ndk@v1 - uses: nttld/setup-ndk@v1
id: setup-ndk id: setup-ndk
with: with:
ndk-version: r25b ndk-version: r26b
add-to-path: false add-to-path: false
local-cache: true local-cache: true

10
hyperbole.py
View file

@ -217,13 +217,13 @@ def cmd_build(pprof=False, release=False, race=False):
+ "/toolchains/llvm/prebuilt/linux-x86_64/bin" + "/toolchains/llvm/prebuilt/linux-x86_64/bin"
) )
if arch == "arm64": if arch == "arm64":
env["CC"] = ANDROID_NDK_HOME + "/aarch64-linux-android33-clang" env["CC"] = ANDROID_NDK_HOME + "/aarch64-linux-android29-clang"
elif arch == "armv7": elif arch == "armv7":
env["CC"] = ANDROID_NDK_HOME + "/armv7a-linux-androideabi33-clang" env["CC"] = ANDROID_NDK_HOME + "/armv7a-linux-androideabi29-clang"
elif arch == "386": elif arch == "386":
env["CC"] = ANDROID_NDK_HOME + "/i686-linux-android33-clang" env["CC"] = ANDROID_NDK_HOME + "/i686-linux-android29-clang"
elif arch == "amd64": elif arch == "amd64":
env["CC"] = ANDROID_NDK_HOME + "/x86_64-linux-android33-clang" env["CC"] = ANDROID_NDK_HOME + "/x86_64-linux-android29-clang"
else: else:
print("Unsupported arch for android: %s" % arch) print("Unsupported arch for android: %s" % arch)
return return
@ -257,7 +257,7 @@ def cmd_build(pprof=False, release=False, race=False):
subprocess.check_call(cmd, env=env) subprocess.check_call(cmd, env=env)
except Exception: except Exception:
print("Failed to build for %s/%s" % (os_name, arch)) print("Failed to build for %s/%s" % (os_name, arch))
return sys.exit(1)
print("Built %s" % out_name) print("Built %s" % out_name)