add on_fetch for android ndk

pull/331/head
ruki 4 years ago
parent 0e98c43453
commit c147564d84
No known key found for this signature in database
GPG Key ID: 809EF06AD42725BD
  1. 2
      packages/l/libbpf/xmake.lua
  2. 11
      packages/n/ndk/xmake.lua

@ -13,7 +13,7 @@ package("libbpf")
on_load("android", function (package)
import("core.tool.toolchain")
local ndk_sdkver = toolchain.load("ndk"):config("ndk_sdkver")
local ndk_sdkver = toolchain.load("ndk", {plat = package:plat(), arch = package:arch()}):config("ndk_sdkver")
if ndk_sdkver and tonumber(ndk_sdkver) < 23 then
package:add("deps", "memorymapping")
end

@ -25,6 +25,17 @@ package("ndk")
add_versions("22.0", "14fce4dea7fb3facbc0e3d20270007bffec3ba383aec02e8b0e0dad8d8782892")
end
on_fetch(function (package, opt)
if opt.system then
import("core.base.semver")
import("detect.sdks.find_ndk")
local ndk = find_ndk()
if ndk and ndk.ndkver and semver.satisfies(ndk.ndkver .. ".0", opt.require_version) then
return true
end
end
end)
on_install("@windows", "@msys", "@linux", "@macosx", function (package)
os.vcp("*", package:installdir())
end)

Loading…
Cancel
Save