Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add riscv64 support for Android NDK projects #5772

Merged
merged 1 commit into from
Oct 31, 2024
Merged

Add riscv64 support for Android NDK projects #5772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions xmake/modules/detect/sdks/find_ndk.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ function _get_triple(arch)
, ["armeabi"] = "arm-linux-androideabi" -- removed in ndk r17
, ["armeabi-v7a"] = "arm-linux-androideabi"
, ["arm64-v8a"] = "aarch64-linux-android"
, ["riscv64"] = "riscv64-linux-android"
, i386 = "i686-linux-android" -- deprecated
, x86 = "i686-linux-android"
, x86_64 = "x86_64-linux-android"
Expand Down Expand Up @@ -90,8 +91,8 @@ function _find_ndk_sdkver(sdkdir, bindir, sysroot, arch)

-- try to select the best compatible version
local sdkver = "16"
if use_llvm or arch == "arm64-v8a" then
sdkver = "21"
if use_llvm or arch == "arm64-v8a" or arch == "riscv64" then
sdkver = (arch == "riscv64") and "35" or "21"
end
if sysroot then
if os.isdir(path.join(sysroot, "usr", "lib", triple, sdkver)) then
Expand Down Expand Up @@ -170,6 +171,7 @@ function _find_ndk(sdkdir, arch, ndk_sdkver, ndk_toolchains_ver)
, ["armeabi"] = "arm-linux-androideabi-" -- removed in ndk r17
, ["armeabi-v7a"] = "arm-linux-androideabi-"
, ["arm64-v8a"] = "aarch64-linux-android-"
, ["riscv64"] = "riscv64-linux-android-"
, i386 = "i686-linux-android-" -- deprecated
, x86 = "i686-linux-android-"
, x86_64 = "x86_64-linux-android-"
Expand All @@ -186,6 +188,7 @@ function _find_ndk(sdkdir, arch, ndk_sdkver, ndk_toolchains_ver)
, ["armeabi"] = "arm-linux-androideabi-*"
, ["armeabi-v7a"] = "arm-linux-androideabi-*"
, ["arm64-v8a"] = "aarch64-linux-android-*"
, ["riscv64"] = "riscv64-linux-android-*"
, i386 = "x86-*"
, x86 = "x86-*"
, x86_64 = "x86_64-*"
Expand Down
2 changes: 1 addition & 1 deletion xmake/platforms/android/xmake.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ platform("android")
-- @see https://developer.android.google.cn/ndk/guides/abis
-- @note The NDK previously supported ARMv5 (armeabi) and 32-bit and 64-bit MIPS, but this support has been removed in NDK r17.
--
set_archs("armeabi", "armeabi-v7a", "arm64-v8a", "x86", "x86_64", "mips", "mip64")
set_archs("armeabi", "armeabi-v7a", "arm64-v8a", "riscv64", "x86", "x86_64", "mips", "mip64")

set_formats("static", "lib$(name).a")
set_formats("object", "$(name).o")
Expand Down
4 changes: 4 additions & 0 deletions xmake/toolchains/ndk/load.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ function _get_triple(arch)
, ["armeabi"] = "arm-linux-androideabi" -- removed in ndk r17
, ["armeabi-v7a"] = "arm-linux-androideabi"
, ["arm64-v8a"] = "aarch64-linux-android"
, ["riscv64"] = "riscv64-linux-android"
, i386 = "i686-linux-android" -- deprecated
, x86 = "i686-linux-android"
, x86_64 = "x86_64-linux-android"
Expand All @@ -49,6 +50,7 @@ function _get_target(arch, ndk_sdkver)
, ["armv7-a"] = "armv7-none-linux-androideabi" -- deprecated
, ["armeabi-v7a"] = "armv7-none-linux-androideabi"
, ["arm64-v8a"] = "aarch64-none-linux-android"
, ["riscv64"] = "riscv64-none-linux-android"
, ["i386"] = "i686-none-linux-android" -- deprecated
, ["x86"] = "i686-none-linux-android"
, ["x86_64"] = "x86_64-none-linux-android"
Expand Down Expand Up @@ -162,6 +164,7 @@ function main(toolchain)
, ["armeabi"] = "arch-arm" -- removed in ndk r17
, ["armeabi-v7a"] = "arch-arm"
, ["arm64-v8a"] = "arch-arm64"
, ["riscv64"] = "arch-riscv64"
, i386 = "arch-x86" -- deprecated
, x86 = "arch-x86"
, x86_64 = "arch-x86_64"
Expand Down Expand Up @@ -264,6 +267,7 @@ function main(toolchain)
, ["armeabi"] = "armeabi" -- removed in ndk r17
, ["armeabi-v7a"] = "armeabi-v7a"
, ["arm64-v8a"] = "arm64-v8a"
, ["riscv64"] = "riscv64"
, i386 = "x86" -- deprecated
, x86 = "x86"
, x86_64 = "x86_64"
Expand Down
Loading