From 0e98c434536242eedac0e168eb1430e7cd9bbbf3 Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 18 Mar 2021 23:22:35 +0800 Subject: [PATCH] improve ndk --- packages/n/ndk/xmake.lua | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/n/ndk/xmake.lua b/packages/n/ndk/xmake.lua index a8c15f23e..d7aaa6f36 100644 --- a/packages/n/ndk/xmake.lua +++ b/packages/n/ndk/xmake.lua @@ -7,22 +7,22 @@ package("ndk") local versions = {["21"] = "r21e", ["22"] = "r22"} 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)] + return versions[tostring(version:major())] end}) - add_versions("21", "f71307c5c572e2c163d602b3704b8bc024bec0c43ba2800de36bd10f3a21492b") - add_versions("22", "5a0eafa83c8bba3c76e8427aa3d83d169215f62963a277b1914a3651aa47f751") + add_versions("21.0", "f71307c5c572e2c163d602b3704b8bc024bec0c43ba2800de36bd10f3a21492b") + add_versions("22.0", "5a0eafa83c8bba3c76e8427aa3d83d169215f62963a277b1914a3651aa47f751") 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)] + return versions[tostring(version:major())] end}) - add_versions("21", "ad7ce5467e18d40050dc51b8e7affc3e635c85bd8c59be62de32352328ed467e") - add_versions("22", "d37fc69cd81e5660234a686e20adef39bc0244086e4d66525a40af771c020718") + add_versions("21.0", "ad7ce5467e18d40050dc51b8e7affc3e635c85bd8c59be62de32352328ed467e") + add_versions("22.0", "d37fc69cd81e5660234a686e20adef39bc0244086e4d66525a40af771c020718") 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)] + return versions[tostring(version:major())] end}) - add_versions("21", "437278103a3db12632c05b1be5c41bbb8522791a67e415cc54411a65366f499d") - add_versions("22", "14fce4dea7fb3facbc0e3d20270007bffec3ba383aec02e8b0e0dad8d8782892") + add_versions("21.0", "437278103a3db12632c05b1be5c41bbb8522791a67e415cc54411a65366f499d") + add_versions("22.0", "14fce4dea7fb3facbc0e3d20270007bffec3ba383aec02e8b0e0dad8d8782892") end on_install("@windows", "@msys", "@linux", "@macosx", function (package)