Merge pull request #1290 from xmake-io/ndk

Improve android ndk to support r22

5 files changed, 152 insertions, 88 deletions

diff --git a/xmake/modules/detect/sdks/find_ndk.lua b/xmake/modules/detect/sdks/find_ndk.lua
index 996b63e8c..bc07f6081 100644
--- a/xmake/modules/detect/sdks/find_ndk.lua
+++ b/xmake/modules/detect/sdks/find_ndk.lua
@@ -25,6 +25,24 @@ import("core.project.config")
 import("core.cache.detectcache")
 import("lib.detect.find_directory")
 
+-- get triple
+function _get_triple(arch)
+    local triples =
+    {
+        ["armv5te"]     = "arm-linux-androideabi"   -- deprecated
+    ,   ["armv7-a"]     = "arm-linux-androideabi"   -- deprecated
+    ,   ["armeabi"]     = "arm-linux-androideabi"   -- removed in ndk r17
+    ,   ["armeabi-v7a"] = "arm-linux-androideabi"
+    ,   ["arm64-v8a"]   = "aarch64-linux-android"
+    ,   i386            = "i686-linux-android"      -- deprecated
+    ,   x86             = "i686-linux-android"
+    ,   x86_64          = "x86_64-linux-android"
+    ,   mips            = "mips-linux-android"      -- removed in ndk r17
+    ,   mips64          = "mips64-linux-android"    -- removed in ndk r17
+    }
+    return triples[arch]
+end
+
 -- find ndk directory
 function _find_ndkdir(sdkdir)
 
@@ -46,7 +64,7 @@ function _find_ndkdir(sdkdir)
 end
 
 -- find the sdk version of ndk
-function _find_ndk_sdkver(sdkdir, bindir, arch)
+function _find_ndk_sdkver(sdkdir, bindir, sysroot, arch)
 
     -- uses llvm stl?
     local use_llvm = false
@@ -60,18 +78,32 @@ function _find_ndk_sdkver(sdkdir, bindir, arch)
         use_llvm = true
     end
 
+    -- get triple
+    local triple = _get_triple(arch)
+
     -- try to select the best compatible version
     local sdkver = "16"
     if use_llvm or arch == "arm64-v8a" then
         sdkver = "21"
     end
+    if sysroot then
+        if os.isdir(path.join(sysroot, "usr", "lib", triple, sdkver)) then
+            return sdkver
+        end
+    end
     if os.isdir(path.join(sdkdir, "platforms", "android-" .. sdkver)) then
         return sdkver
     end
 
     -- find the max version
     local sdkver_max = 0
-    for _, sdkdir in ipairs(os.dirs(path.join(sdkdir, "platforms", "android-*"))) do
+    local sdkver_dir_pattern
+    if sysroot and os.isdir(path.join(sysroot, "usr", "lib")) then
+        sdkver_dir_pattern = path.join(sysroot, "usr", "lib", triple, "*")
+    else
+        sdkver_dir_pattern = path.join(sdkdir, "platforms", "android-*")
+    end
+    for _, sdkdir in ipairs(os.dirs(sdkver_dir_pattern)) do
 
         -- get version
         local filename = path.filename(sdkdir)
@@ -95,6 +127,25 @@ function _find_ndk_toolchains_ver(bindir)
     return bindir:match("%-(%d*%.%d*)[/\\]")
 end
 
+-- find sysroot directory
+function _find_ndk_sysroot(sdkdir)
+
+    -- get sysroot above ndk r22
+    -- @see https://github.com/android/ndk/wiki/Changelog-r22
+    local prebuilt = (is_host("macosx") and "darwin" or os.host()) .. "-x86_64"
+    local sysroot_r22 = path.join(sdkdir, "toolchains", "llvm", "prebuilt", prebuilt, "sysroot")
+    if os.isdir(sysroot_r22) then
+        return sysroot_r22
+    end
+
+    -- get sysroot above ndk r14
+    -- @see https://android.googlesource.com/platform/ndk/+/master/docs/UnifiedHeaders.md
+    local sysroot_r14 = path.join(sdkdir, "sysroot")
+    if os.isdir(sysroot_r14) then
+        return sysroot_r14
+    end
+end
+
 -- find the ndk toolchain
 function _find_ndk(sdkdir, arch, ndk_sdkver, ndk_toolchains_ver)
 
@@ -145,9 +196,6 @@ function _find_ndk(sdkdir, arch, ndk_sdkver, ndk_toolchains_ver)
         return
     end
 
-    -- find the sdk version
-    local sdkver = ndk_sdkver or _find_ndk_sdkver(sdkdir, bindir, arch)
-
     -- find the gcc toolchain
     local gcc_toolchain = find_directory("bin", path.join(sdkdir, "toolchains", gcc_toolchain_subdir, "prebuilt", "*"))
     if gcc_toolchain then
@@ -157,21 +205,35 @@ function _find_ndk(sdkdir, arch, ndk_sdkver, ndk_toolchains_ver)
     -- find the toolchains version
     local toolchains_ver = ndk_toolchains_ver or _find_ndk_toolchains_ver(gcc_toolchain or bindir)
 
+    -- find sysroot directory
+    local sysroot = _find_ndk_sysroot(sdkdir)
+
+    -- find the sdk version
+    local sdkver = ndk_sdkver or _find_ndk_sdkver(sdkdir, bindir, sysroot, arch)
+
     -- get ndk version, e.g. r16b, ..
     local ndkver = nil
-    local ndk_version_header = path.join(sdkdir, "sysroot/usr/include/android/ndk-version.h")
-    if os.isfile(ndk_version_header) then
-        local ndk_version_info = io.readfile(ndk_version_header)
-        if ndk_version_info then
-            ndk_version_info = ndk_version_info:match("#define __NDK_MAJOR__ (%d+)")
+    if sysroot then
+        local ndk_version_header = path.join(sysroot, "usr/include/android/ndk-version.h")
+        if os.isfile(ndk_version_header) then
+            local ndk_version_info = io.readfile(ndk_version_header)
             if ndk_version_info then
-                ndkver = tonumber(ndk_version_info)
+                ndk_version_info = ndk_version_info:match("#define __NDK_MAJOR__ (%d+)")
+                if ndk_version_info then
+                    ndkver = tonumber(ndk_version_info)
+                end
             end
         end
     end
 
-    -- ok?
-    return {ndkver = ndkver, sdkdir = sdkdir, bindir = bindir, cross = cross, sdkver = sdkver, gcc_toolchain = gcc_toolchain, toolchains_ver = toolchains_ver}
+    return {ndkver = ndkver,
+            sdkdir = sdkdir,
+            bindir = bindir,
+            cross = cross,
+            sdkver = sdkver,
+            gcc_toolchain = gcc_toolchain,
+            toolchains_ver = toolchains_ver,
+            sysroot = sysroot}
 end
 
 -- find ndk toolchains
diff --git a/xmake/modules/package/manager/conan/install_package.lua b/xmake/modules/package/manager/conan/install_package.lua
index 0b27fdb24..97af3b4b8 100644
--- a/xmake/modules/package/manager/conan/install_package.lua
+++ b/xmake/modules/package/manager/conan/install_package.lua
@@ -271,10 +271,11 @@ function main(name, opt)
         envs.ARFLAGS   = table.concat(table.wrap(_conan_get_build_env("arflags", opt.plat)), ' ')
         envs.LDFLAGS   = table.concat(table.wrap(_conan_get_build_env("ldflags", opt.plat)), ' ')
         envs.SHFLAGS   = table.concat(table.wrap(_conan_get_build_env("shflags", opt.plat)), ' ')
-        local ndk = config.get("ndk")
-        if ndk then
+        local toolchain_ndk = toolchain.load("ndk", {plat = opt.plat, arch = opt.arch})
+        local ndk_sysroot = toolchain_ndk:config("ndk_sysroot")
+        if ndk_sysroot then
             table.insert(argv, "-e")
-            table.insert(argv, "CONAN_CMAKE_FIND_ROOT_PATH=" .. path.join(ndk, "sysroot"))
+            table.insert(argv, "CONAN_CMAKE_FIND_ROOT_PATH=" .. ndk_sysroot)
         end
         for k, v in pairs(envs) do
             table.insert(argv, "-e")
diff --git a/xmake/rules/qt/deploy/android.lua b/xmake/rules/qt/deploy/android.lua
index 6c61c7baa..97f97ea7a 100644
--- a/xmake/rules/qt/deploy/android.lua
+++ b/xmake/rules/qt/deploy/android.lua
@@ -135,8 +135,8 @@ function main(target, opt)
     -- get stdcpp path
     local stdcpp_path = path.join(ndk, "sources/cxx-stl/llvm-libc++/libs", target_arch, "libc++_shared.so")
     if qt_sdkver and qt_sdkver:ge("5.14") then
-        local toolchain = path.directory(assert(toolchain_ndk:bindir(), "toolchain/bin directory not found!"))
-        stdcpp_path = path.join(toolchain, "sysroot", "usr", "lib")
+        local ndk_sysroot = assert(toolchain_ndk:config("ndk_sysroot"), "NDK sysroot directory not found!")
+        stdcpp_path = path.join(ndk_sysroot, "usr", "lib")
     end
 
     -- get toolchain version
diff --git a/xmake/toolchains/ndk/check.lua b/xmake/toolchains/ndk/check.lua
index ceedf4341..fe8183277 100644
--- a/xmake/toolchains/ndk/check.lua
+++ b/xmake/toolchains/ndk/check.lua
@@ -34,6 +34,7 @@ function _check_ndk(toolchain)
         toolchain:config_set("ndkver", ndk.ndkver)
         toolchain:config_set("ndk_sdkver", ndk.sdkver)
         toolchain:config_set("ndk_toolchains_ver", ndk.toolchains_ver)
+        toolchain:config_set("ndk_sysroot", ndk.sysroot)
         toolchain:configs_save()
     else
         -- failed
diff --git a/xmake/toolchains/ndk/load.lua b/xmake/toolchains/ndk/load.lua
index a21b9fbf2..29e88d7ad 100644
--- a/xmake/toolchains/ndk/load.lua
+++ b/xmake/toolchains/ndk/load.lua
@@ -21,6 +21,43 @@
 -- imports
 import("core.project.config")
 
+-- get triple
+function _get_triple(arch)
+    local triples =
+    {
+        ["armv5te"]     = "arm-linux-androideabi"   -- deprecated
+    ,   ["armv7-a"]     = "arm-linux-androideabi"   -- deprecated
+    ,   ["armeabi"]     = "arm-linux-androideabi"   -- removed in ndk r17
+    ,   ["armeabi-v7a"] = "arm-linux-androideabi"
+    ,   ["arm64-v8a"]   = "aarch64-linux-android"
+    ,   i386            = "i686-linux-android"      -- deprecated
+    ,   x86             = "i686-linux-android"
+    ,   x86_64          = "x86_64-linux-android"
+    ,   mips            = "mips-linux-android"      -- removed in ndk r17
+    ,   mips64          = "mips64-linux-android"    -- removed in ndk r17
+    }
+    return triples[arch]
+end
+
+-- get target
+function _get_target(arch, ndk_sdkver)
+    local targets =
+    {
+        ["armv5te"]     = "armv5te-none-linux-androideabi"  -- deprecated
+    ,   ["armeabi"]     = "armv5te-none-linux-androideabi"  -- removed in ndk r17
+    ,   ["armv7-a"]     = "armv7-none-linux-androideabi"    -- deprecated
+    ,   ["armeabi-v7a"] = "armv7-none-linux-androideabi"
+    ,   ["arm64-v8a"]   = "aarch64-none-linux-android"
+    ,   ["i386"]        = "i686-none-linux-android"         -- deprecated
+    ,   ["x86"]         = "i686-none-linux-android"
+    ,   ["x86_64"]      = "x86_64-none-linux-android"
+    ,   ["mips"]        = "mipsel-none-linux-android"       -- removed in ndk r17
+    ,   ["mips64"]      = "mips64el-none-linux-android"     -- removed in ndk r17
+    }
+    assert(targets[arch], "unknown arch(%s) for android!", arch)
+    return targets[arch] .. (ndk_sdkver or "")
+end
+
 -- load ndk toolchain
 --
 -- some extra configuration for target
@@ -39,6 +76,11 @@ function main(toolchain)
         gcc_toolchain_bin = path.join(gcc_toolchain, "bin")
     end
 
+    -- get ndk and version
+    local ndk = toolchain:config("ndk")
+    local ndkver = toolchain:config("ndkver")
+    local ndk_sdkver = toolchain:config("ndk_sdkver")
+
     -- set toolset
     toolchain:set("toolset", "cc", "clang", cross .. "gcc")
     toolchain:set("toolset", "cxx", "clang++", cross .. "g++")
@@ -70,25 +112,12 @@ function main(toolchain)
     -- init architecture
     if isllvm then
 
-        -- add target
-        local targets =
-        {
-            ["armv5te"]     = "armv5te-none-linux-androideabi"  -- deprecated
-        ,   ["armeabi"]     = "armv5te-none-linux-androideabi"  -- removed in ndk r17
-        ,   ["armv7-a"]     = "armv7-none-linux-androideabi"    -- deprecated
-        ,   ["armeabi-v7a"] = "armv7-none-linux-androideabi"
-        ,   ["arm64-v8a"]   = "aarch64-none-linux-android"
-        ,   ["i386"]        = "i686-none-linux-android"         -- deprecated
-        ,   ["x86"]         = "i686-none-linux-android"
-        ,   ["x86_64"]      = "x86_64-none-linux-android"
-        ,   ["mips"]        = "mipsel-none-linux-android"       -- removed in ndk r17
-        ,   ["mips64"]      = "mips64el-none-linux-android"     -- removed in ndk r17
-        }
-        assert(targets[arch], "unknown arch(%s) for android!", arch)
-        toolchain:add("cxflags", "-target " .. targets[arch])
-        toolchain:add("asflags", "-target " .. targets[arch])
-        toolchain:add("ldflags", "-target " .. targets[arch])
-        toolchain:add("shflags", "-target " .. targets[arch])
+        -- add ndk target
+        local ndk_target = _get_target(arch, ndk_sdkver)
+        toolchain:add("cxflags", "-target " .. ndk_target)
+        toolchain:add("asflags", "-target " .. ndk_target)
+        toolchain:add("ldflags", "-target " .. ndk_target)
+        toolchain:add("shflags", "-target " .. ndk_target)
 
         -- add gcc toolchain
         local gcc_toolchain = toolchain:config("gcc_toolchain")
@@ -116,9 +145,6 @@ function main(toolchain)
     toolchain:add("binary.cxflags", "-fPIE", "-pie")
 
     -- add flags for the sdk directory of ndk
-    local ndk = toolchain:config("ndk")
-    local ndkver = toolchain:config("ndkver")
-    local ndk_sdkver = toolchain:config("ndk_sdkver")
     if ndk and ndk_sdkver then
 
         -- the sysroot archs
@@ -137,59 +163,30 @@ function main(toolchain)
         }
         local sysroot_arch = sysroot_archs[arch]
 
-        -- add sysroot
-        --
-        -- @see https://android.googlesource.com/platform/ndk/+/master/docs/UnifiedHeaders.md
-        --
-        -- Before NDK r14, we had a set of libc headers for each API version.
-        -- In many cases these headers were incorrect. Many exposed APIs that didn‘t exist, and others didn’t expose APIs that did.
-        --
-        -- In NDK r14 (as an opt in feature) we unified these into a single set of headers, called unified headers.
-        -- This single header path is used for every platform level. API level guards are handled with #ifdef.
-        -- These headers can be found in prebuilts/ndk/headers.
-        --
-        -- Unified headers are built directly from the Android platform, so they are up to date and correct (or at the very least,
-        -- any bugs in the NDK headers will also be a bug in the platform headers, which means we're much more likely to find them).
-        --
-        -- In r15 unified headers are used by default. In r16, the old headers have been removed.
-        --
-        local ndk_sdkdir = path.translate(format("%s/platforms/android-%d", ndk, ndk_sdkver))
-        local ndk_sysroot_be_r14 = path.join(ndk, "sysroot")
-        if os.isdir(ndk_sysroot_be_r14) then
-
-            -- the triples
-            local triples =
-            {
-                ["armv5te"]     = "arm-linux-androideabi"   -- deprecated
-            ,   ["armv7-a"]     = "arm-linux-androideabi"   -- deprecated
-            ,   ["armeabi"]     = "arm-linux-androideabi"   -- removed in ndk r17
-            ,   ["armeabi-v7a"] = "arm-linux-androideabi"
-            ,   ["arm64-v8a"]   = "aarch64-linux-android"
-            ,   i386            = "i686-linux-android"      -- deprecated
-            ,   x86             = "i686-linux-android"
-            ,   x86_64          = "x86_64-linux-android"
-            ,   mips            = "mips-linux-android"      -- removed in ndk r17
-            ,   mips64          = "mips64-linux-android"    -- removed in ndk r17
-            }
+        -- add sysroot flags
+        local ndk_sysroot = toolchain:config("ndk_sysroot")
+        if ndk_sysroot and os.isdir(ndk_sysroot) then
+            local triple = _get_triple(arch)
             toolchain:add("cxflags", "-D__ANDROID_API__=" .. ndk_sdkver)
             toolchain:add("asflags", "-D__ANDROID_API__=" .. ndk_sdkver)
-            toolchain:add("cflags",  "--sysroot=" .. ndk_sysroot_be_r14)
-            toolchain:add("cxxflags","--sysroot=" .. ndk_sysroot_be_r14)
-            toolchain:add("asflags", "--sysroot=" .. ndk_sysroot_be_r14)
-            toolchain:add("cflags",  "-isystem " .. path.join(ndk_sysroot_be_r14, "usr", "include", triples[arch]))
-            toolchain:add("cxxflags","-isystem " .. path.join(ndk_sysroot_be_r14, "usr", "include", triples[arch]))
-            toolchain:add("asflags", "-isystem " .. path.join(ndk_sysroot_be_r14, "usr", "include", triples[arch]))
+            toolchain:add("cflags",  "--sysroot=" .. ndk_sysroot)
+            toolchain:add("cxxflags","--sysroot=" .. ndk_sysroot)
+            toolchain:add("asflags", "--sysroot=" .. ndk_sysroot)
+            toolchain:add("cflags",  "-isystem " .. path.join(ndk_sysroot, "usr", "include", triple))
+            toolchain:add("cxxflags","-isystem " .. path.join(ndk_sysroot, "usr", "include", triple))
+            toolchain:add("asflags", "-isystem " .. path.join(ndk_sysroot, "usr", "include", triple))
         else
-            if sysroot_arch then
-                toolchain:add("cflags",   format("--sysroot=%s/%s", ndk_sdkdir, sysroot_arch))
-                toolchain:add("cxxflags", format("--sysroot=%s/%s", ndk_sdkdir, sysroot_arch))
-                toolchain:add("asflags",  format("--sysroot=%s/%s", ndk_sdkdir, sysroot_arch))
+            local ndk_sdkdir = path.translate(format("%s/platforms/android-%d", ndk, ndk_sdkver))
+            if os.isdir(ndk_sdkdir) then
+                if sysroot_arch then
+                    toolchain:add("cflags",   format("--sysroot=%s/%s", ndk_sdkdir, sysroot_arch))
+                    toolchain:add("cxxflags", format("--sysroot=%s/%s", ndk_sdkdir, sysroot_arch))
+                    toolchain:add("asflags",  format("--sysroot=%s/%s", ndk_sdkdir, sysroot_arch))
+                    toolchain:add("ldflags", format("--sysroot=%s/%s", ndk_sdkdir, sysroot_arch))
+                    toolchain:add("shflags", format("--sysroot=%s/%s", ndk_sdkdir, sysroot_arch))
+                end
             end
         end
-        if sysroot_arch then
-            toolchain:add("ldflags", format("--sysroot=%s/%s", ndk_sdkdir, sysroot_arch))
-            toolchain:add("shflags", format("--sysroot=%s/%s", ndk_sdkdir, sysroot_arch))
-        end
 
         -- add "-fPIE -pie" to ldflags
         toolchain:add("ldflags", "-fPIE")
@@ -254,6 +251,7 @@ function main(toolchain)
                 toolchain:add("linkdirs", format("%s/libs/%s", cxxstl_sdkdir, toolchains_arch))
             end
             if ndk_cxxstl:startswith("c++") or ndk_cxxstl:startswith("llvmstl") then
+                toolchain:add("cxxflags", "-nostdinc++")
                 toolchain:add("sysincludedirs", format("%s/include", cxxstl_sdkdir))
                 if toolchains_arch then
                     toolchain:add("sysincludedirs", format("%s/libs/%s/include", cxxstl_sdkdir, toolchains_arch))
@@ -267,11 +265,13 @@ function main(toolchain)
                     toolchain:add("sysincludedirs", after_r13)
                 end
             elseif ndk_cxxstl:startswith("gnustl") then
+                toolchain:add("cxxflags", "-nostdinc++")
                 toolchain:add("sysincludedirs", format("%s/include", cxxstl_sdkdir))
                 if toolchains_arch then
                     toolchain:add("sysincludedirs", format("%s/libs/%s/include", cxxstl_sdkdir, toolchains_arch))
                 end
             elseif ndk_cxxstl:startswith("stlport") then
+                toolchain:add("cxxflags", "-nostdinc++")
                 toolchain:add("sysincludedirs", format("%s/stlport", cxxstl_sdkdir))
             end