From 899ff0e67bfb389e9b1cfd6b11ec8d705e6535db Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Tue, 31 Dec 2024 15:29:31 +0000
Subject: [PATCH] Add lyrebird 0.5.0-1 compatible with Android 4.
---
build-binary.py | 3 ++-
versions.json | 17 +++++++++++++++++
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/build-binary.py b/build-binary.py
index ff714ab..2ca9fc6 100755
--- a/build-binary.py
+++ b/build-binary.py
@@ -106,7 +106,8 @@ def build_android(tool, versions):
def build_android_arch(tool, versions, env, clang_arch, ndk_arch, abi):
- min_api = '21'
+ # TODO: Raise API level and upgrade NDK when we drop support for Android 4
+ min_api = '21' if ndk_arch.endswith('64') else '16'
clang = "%s/toolchains/llvm/prebuilt/linux-x86_64/bin/%s%s-clang" % (NDK_DIR, clang_arch, min_api)
env['CC'] = os.path.abspath(clang)
diff --git a/versions.json b/versions.json
index e58e847..2816458 100644
--- a/versions.json
+++ b/versions.json
@@ -1,5 +1,22 @@
{
"lyrebird": {
+ "0.5.0-1": {
+ "repo_url": "https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/lyrebird.git",
+ "revision": "297ae51866f56146f0523bcf2fd84e0b6ee8a88a",
+ "ld_flags": "-X main.lyrebirdVersion=0.5.0",
+ "build_path": "cmd/lyrebird",
+ "repo_dir": "lyrebird",
+ "go": {
+ "version": "go1.21.13",
+ "sha256": "71fb31606a1de48d129d591e8717a63e0c5565ffba09a24ea9f899a13214c34d"
+ },
+ "ndk": {
+ "url": "https://dl.google.com/android/repository/android-ndk-r23c-linux.zip",
+ "revision": "23.2.8568313",
+ "sha256": "6ce94604b77d28113ecd588d425363624a5228d9662450c48d2e4053f8039242"
+ },
+ "timestamp": "201001010000.00"
+ },
"0.5.0": {
"repo_url": "https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/lyrebird.git",
"revision": "297ae51866f56146f0523bcf2fd84e0b6ee8a88a",
--
GitLab