From 84fff858b794cbb0fb3681f44129d61986c17c9f Mon Sep 17 00:00:00 2001 From: zebede22 <132909114+zebede22@users.noreply.github.com> Date: Wed, 24 Jan 2024 11:23:28 +0400 Subject: [PATCH 1/5] NDK LTS Add latest NDK LTS: https://github.com/android/ndk/wiki --- packages/n/ndk/xmake.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/n/ndk/xmake.lua b/packages/n/ndk/xmake.lua index 434c794742e..5b8b8e9ee91 100644 --- a/packages/n/ndk/xmake.lua +++ b/packages/n/ndk/xmake.lua @@ -4,19 +4,21 @@ package("ndk") set_homepage("https://developer.android.com/ndk") set_description("Android NDK toolchain.") - local versions = {["21"] = "r21e", ["22"] = "r22"} + local versions = {["21"] = "r21e", ["22"] = "r22", ["26"] = "r26b"} if is_host("windows") then set_urls("https://dl.google.com/android/repository/android-ndk-$(version)-windows-x86_64.zip", {version = function (version) return versions[tostring(version:major())] end}) add_versions("21.0", "f71307c5c572e2c163d602b3704b8bc024bec0c43ba2800de36bd10f3a21492b") add_versions("22.0", "5a0eafa83c8bba3c76e8427aa3d83d169215f62963a277b1914a3651aa47f751") + add_versions("26.0", "a478d43d4a45d0d345cda6be50d79642b92fb175868d9dc0dfc86181d80f691e") elseif is_host("linux") then set_urls("https://dl.google.com/android/repository/android-ndk-$(version)-linux-x86_64.zip", {version = function (version) return versions[tostring(version:major())] end}) add_versions("21.0", "ad7ce5467e18d40050dc51b8e7affc3e635c85bd8c59be62de32352328ed467e") add_versions("22.0", "d37fc69cd81e5660234a686e20adef39bc0244086e4d66525a40af771c020718") + add_versions("26.0", "ad73c0370f0b0a87d1671ed2fd5a9ac9acfd1eb5c43a7fbfbd330f85d19dd632") elseif is_host("macosx") then set_urls("https://dl.google.com/android/repository/android-ndk-$(version)-darwin-x86_64.zip", {version = function (version) return versions[tostring(version:major())] From 93538d6c8d40d8c72fe2b1ab156134662b14b399 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Wed, 24 Jan 2024 11:45:31 +0100 Subject: [PATCH 2/5] Update xmake.lua --- packages/n/ndk/xmake.lua | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/n/ndk/xmake.lua b/packages/n/ndk/xmake.lua index 5b8b8e9ee91..6b5e3a48b43 100644 --- a/packages/n/ndk/xmake.lua +++ b/packages/n/ndk/xmake.lua @@ -4,16 +4,17 @@ package("ndk") set_homepage("https://developer.android.com/ndk") set_description("Android NDK toolchain.") - local versions = {["21"] = "r21e", ["22"] = "r22", ["26"] = "r26b"} if is_host("windows") then - set_urls("https://dl.google.com/android/repository/android-ndk-$(version)-windows-x86_64.zip", {version = function (version) + local versions = {["21"] = "r21e-windows-x86_64", ["22"] = "r22-windows-x86_64", ["26"] = "r26b-windows"} + set_urls("https://dl.google.com/android/repository/android-ndk-$(version).zip", {version = function (version) return versions[tostring(version:major())] end}) add_versions("21.0", "f71307c5c572e2c163d602b3704b8bc024bec0c43ba2800de36bd10f3a21492b") add_versions("22.0", "5a0eafa83c8bba3c76e8427aa3d83d169215f62963a277b1914a3651aa47f751") add_versions("26.0", "a478d43d4a45d0d345cda6be50d79642b92fb175868d9dc0dfc86181d80f691e") elseif is_host("linux") then - set_urls("https://dl.google.com/android/repository/android-ndk-$(version)-linux-x86_64.zip", {version = function (version) + local versions = {["21"] = "r21e-linux-x86_64", ["22"] = "r22-linux-x86_64", ["26"] = "r26b-linux"} + set_urls("https://dl.google.com/android/repository/android-ndk-$(version).zip", {version = function (version) return versions[tostring(version:major())] end}) add_versions("21.0", "ad7ce5467e18d40050dc51b8e7affc3e635c85bd8c59be62de32352328ed467e") From 185fb6ed84d400d4060411f5d8269db8dc96b599 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Wed, 24 Jan 2024 11:46:42 +0100 Subject: [PATCH 3/5] Update xmake.lua --- packages/n/ndk/xmake.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/n/ndk/xmake.lua b/packages/n/ndk/xmake.lua index 6b5e3a48b43..04d1d87c796 100644 --- a/packages/n/ndk/xmake.lua +++ b/packages/n/ndk/xmake.lua @@ -1,5 +1,4 @@ package("ndk") - set_kind("toolchain") set_homepage("https://developer.android.com/ndk") set_description("Android NDK toolchain.") @@ -21,6 +20,7 @@ package("ndk") add_versions("22.0", "d37fc69cd81e5660234a686e20adef39bc0244086e4d66525a40af771c020718") add_versions("26.0", "ad73c0370f0b0a87d1671ed2fd5a9ac9acfd1eb5c43a7fbfbd330f85d19dd632") elseif is_host("macosx") then + local versions = {["21"] = "r21e", ["22"] = "r22"} set_urls("https://dl.google.com/android/repository/android-ndk-$(version)-darwin-x86_64.zip", {version = function (version) return versions[tostring(version:major())] end}) From 791ac9d70c383f12abb59117610556adb5ed4e9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Wed, 24 Jan 2024 14:25:10 +0100 Subject: [PATCH 4/5] Update xmake.lua --- packages/n/ndk/xmake.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/n/ndk/xmake.lua b/packages/n/ndk/xmake.lua index 04d1d87c796..be59fdca659 100644 --- a/packages/n/ndk/xmake.lua +++ b/packages/n/ndk/xmake.lua @@ -20,12 +20,13 @@ package("ndk") add_versions("22.0", "d37fc69cd81e5660234a686e20adef39bc0244086e4d66525a40af771c020718") add_versions("26.0", "ad73c0370f0b0a87d1671ed2fd5a9ac9acfd1eb5c43a7fbfbd330f85d19dd632") elseif is_host("macosx") then - local versions = {["21"] = "r21e", ["22"] = "r22"} - set_urls("https://dl.google.com/android/repository/android-ndk-$(version)-darwin-x86_64.zip", {version = function (version) + local versions = {["21"] = "r21e-darwin-x86_64", ["22"] = "r22-darwin-x86_64", ["26"] = "r26b-darwin"} + set_urls("https://dl.google.com/android/repository/android-ndk-$(version)-darwin.zip", {version = function (version) return versions[tostring(version:major())] end}) add_versions("21.0", "437278103a3db12632c05b1be5c41bbb8522791a67e415cc54411a65366f499d") add_versions("22.0", "14fce4dea7fb3facbc0e3d20270007bffec3ba383aec02e8b0e0dad8d8782892") + add_versions("26.0", "4b0ea6148a9a2337e62a0c0c7ac59ff1edc38d69b81d9c58251897d23f7fa321") end on_fetch(function (package, opt) From f62cfbc29ba14080e25f87e54cb5359b419f1581 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Wed, 24 Jan 2024 14:35:28 +0100 Subject: [PATCH 5/5] Update xmake.lua --- packages/n/ndk/xmake.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/n/ndk/xmake.lua b/packages/n/ndk/xmake.lua index be59fdca659..9185944d19b 100644 --- a/packages/n/ndk/xmake.lua +++ b/packages/n/ndk/xmake.lua @@ -21,7 +21,7 @@ package("ndk") add_versions("26.0", "ad73c0370f0b0a87d1671ed2fd5a9ac9acfd1eb5c43a7fbfbd330f85d19dd632") elseif is_host("macosx") then local versions = {["21"] = "r21e-darwin-x86_64", ["22"] = "r22-darwin-x86_64", ["26"] = "r26b-darwin"} - set_urls("https://dl.google.com/android/repository/android-ndk-$(version)-darwin.zip", {version = function (version) + set_urls("https://dl.google.com/android/repository/android-ndk-$(version).zip", {version = function (version) return versions[tostring(version:major())] end}) add_versions("21.0", "437278103a3db12632c05b1be5c41bbb8522791a67e415cc54411a65366f499d")