|
15 | 15 | <_NdkClangPrefix Condition=" '$(RuntimeIdentifier)' == 'linux-bionic-arm64' ">aarch64-linux-android21-</_NdkClangPrefix>
|
16 | 16 | <_NdkSysrootAbi Condition=" '$(RuntimeIdentifier)' == 'linux-bionic-x64' ">x86_64-linux-android</_NdkSysrootAbi>
|
17 | 17 | <_NdkClangPrefix Condition=" '$(RuntimeIdentifier)' == 'linux-bionic-x64' ">x86_64-linux-android21-</_NdkClangPrefix>
|
18 |
| - <_NdkPrebuiltAbi Condition=" '$(NETCoreSdkRuntimeIdentifier)' == 'osx-x64' ">darwin-x86_64</_NdkPrebuiltAbi> |
| 18 | + <_NdkPrebuiltAbi Condition=" $([MSBuild]::IsOSPlatform('osx')) ">darwin-x86_64</_NdkPrebuiltAbi> |
| 19 | + <_NdkPrebuiltAbi Condition=" $([MSBuild]::IsOSPlatform('linux')) ">linux-x86_64</_NdkPrebuiltAbi> |
| 20 | + <_NdkPrebuiltAbi Condition=" $([MSBuild]::IsOSPlatform('windows')) ">windows-x86_64</_NdkPrebuiltAbi> |
19 | 21 | <_NdkSysrootLibDir>$(AndroidNdkDirectory)/toolchains/llvm/prebuilt/$(_NdkPrebuiltAbi)/sysroot/usr/lib/$(_NdkSysrootAbi)</_NdkSysrootLibDir>
|
20 | 22 | <_NdkBinDir>$(AndroidNdkDirectory)/toolchains/llvm/prebuilt/$(_NdkPrebuiltAbi)/bin</_NdkBinDir>
|
21 | 23 | </PropertyGroup>
|
22 | 24 |
|
23 | 25 | <PropertyGroup Condition="$(RuntimeIdentifier.StartsWith('linux-bionic'))">
|
24 |
| - <CppCompilerAndLinker>$(_NdkBinDir)/$(_NdkClangPrefix)clang</CppCompilerAndLinker> |
25 |
| - <ObjCopyName>$(_NdkBinDir)/llvm-objcopy</ObjCopyName> |
| 26 | + <CppCompilerAndLinker Condition=" '$(OS)' == 'Windows_NT' ">$(_NdkClangPrefix)clang.cmd</CppCompilerAndLinker> |
| 27 | + <CppCompilerAndLinker Condition=" '$(OS)' != 'Windows_NT' ">$(_NdkBinDir)/$(_NdkClangPrefix)clang</CppCompilerAndLinker> |
| 28 | + <ObjCopyName Condition=" '$(OS)' == 'Windows_NT' ">llvm-objcopy.exe</ObjCopyName> |
| 29 | + <ObjCopyName Condition=" '$(OS)' != 'Windows_NT' ">$(_NdkBinDir)/llvm-objcopy</ObjCopyName> |
26 | 30 | </PropertyGroup>
|
27 | 31 |
|
28 | 32 | <ItemGroup Condition="$(RuntimeIdentifier.StartsWith('linux-bionic'))">
|
29 | 33 | <LinkerArg Include="-Wl,--undefined-version" />
|
30 | 34 | </ItemGroup>
|
31 | 35 |
|
| 36 | + <PropertyGroup> |
| 37 | + <_HomeDir Condition=" '$(OS)' != 'Windows_NT' ">$(HOME)/</_HomeDir> |
| 38 | + <_HomeDir Condition=" '$(OS)' == 'Windows_NT' ">$(HOMEDRIVE)$(HOMEPATH)\</_HomeDir> |
| 39 | + </PropertyGroup> |
| 40 | + |
32 | 41 | <Target Name="_ValidateEnvironment"
|
33 | 42 | BeforeTargets="Build">
|
34 | 43 | <Error
|
|
43 | 52 | Condition=" '$(AndroidSdkDirectory)' == '' Or !Exists($(AndroidSdkDirectory)) "
|
44 | 53 | Text="Set the %24(AndroidSdkDirectory) MSBuild property or the %24ANDROID_HOME environment variable to the path of the Android SDK."
|
45 | 54 | />
|
| 55 | + <PropertyGroup> |
| 56 | + <_DebugKeystorePath>$(_HomeDir).android/debug.keystore</_DebugKeystorePath> |
| 57 | + </PropertyGroup> |
| 58 | + <Error |
| 59 | + Condition=" !Exists($(_DebugKeystorePath)) " |
| 60 | + Text="Keystore file `$(_DebugKeystorePath)` does not exist. This is needed to sign .apk files. See README.md for details." |
| 61 | + /> |
| 62 | + <PropertyGroup> |
| 63 | + <_WinNdkBinDir>$(_NdkBinDir.Replace('/', '%5c'))</_WinNdkBinDir> |
| 64 | + </PropertyGroup> |
| 65 | + <Error |
| 66 | + Condition=" '$(OS)' == 'Windows_NT' And !$(PATH.Contains($(_WinNdkBinDir))) " |
| 67 | + Text="The %PATH% environment variable must contain: $(_WinNdkBinDir)" |
| 68 | + /> |
46 | 69 | </Target>
|
47 | 70 |
|
48 | 71 | <ItemGroup>
|
|
0 commit comments