GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Fix Android build with NDK 25

Browse Source
This commit is contained in:
Wojtek Figat
2022-08-03 18:09:52 +02:00
parent 4923d63a94
commit cc59a2b5fe
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Tools/Flax.Build/Platforms/Android/AndroidToolchain.cs
View File

@@ -1,5 +1,6 @@
// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
using System;
using System.Collections.Generic;
using System.IO;
using Flax.Build.Graph;
@@ -188,7 +189,16 @@ namespace Flax.Build.Platforms
// Bundle STL library for the executable files for runtime
if (options.LinkEnv.Output == LinkerOutput.Executable)
{
graph.AddCopyFile(Path.Combine(Path.GetDirectoryName(outputFilePath), "libc++_shared.so"), Path.Combine(AndroidNdk.Instance.RootPath, "sources/cxx-stl/llvm-libc++/libs/", GetAbiName(Architecture), "libc++_shared.so"));
// https://android.googlesource.com/platform/ndk/+/master/docs/BuildSystemMaintainers.md#libc
var ndkPath = AndroidNdk.Instance.RootPath;
var libCppSharedPath = Path.Combine(ndkPath, "sources/cxx-stl/llvm-libc++/libs/", GetAbiName(Architecture), "libc++_shared.so"); // NDK24 (and older) location
if (!File.Exists(libCppSharedPath))
{
libCppSharedPath = Path.Combine(ndkPath, "toolchains/llvm/prebuilt", AndroidSdk.GetHostName(), "sysroot/usr/lib/", GetToolchainName(TargetPlatform.Android, Architecture), "libc++_shared.so"); // NDK25+ location
if (!File.Exists(libCppSharedPath))
throw new Exception($"Missing Android NDK `libc++_shared.so` for architecture {Architecture}.");
}
graph.AddCopyFile(Path.Combine(Path.GetDirectoryName(outputFilePath), "libc++_shared.so"), libCppSharedPath);
}
var task = base.CreateBinary(graph, options, outputFilePath);