Skip to content
Permalink
Browse files

[Build] Stop detecting Android NDK version using folder name (latest …

…VS2019 uses "ndk-build" folder name without version)
  • Loading branch information
xen2 committed May 23, 2019
1 parent 2f396b1 commit 3af4664400c66cc7d4724f516fbc9ab0728fee10
Showing with 0 additions and 1 deletion.
  1. +0 −1 sources/native/Xenko.Native.targets
@@ -209,7 +209,6 @@

<Target Name="CompileNativeClang_Android" Inputs="@(XenkoNativeCFile);@(XenkoNativeHFile)" Outputs="@(XenkoNativeOutput)" Condition="'$(XenkoPlatform)' == 'Android' And $(DesignTimeBuild) != true And $(BuildingProject) != false" BeforeTargets="CoreCompile" DependsOnTargets="_XenkoRegisterNativeOutputs">
<Error Text="The AndroidNdkDirectory environment variable is not set!" Condition="'$(AndroidNdkDirectory)' == ''" />
<Error Text="The installed NDK version is outdated, please install a r10+! ($(AndroidNdkDirectory))" Condition="'$([System.Text.RegularExpressions.Regex]::Match(`$(AndroidNdkDirectory)`, `.*r\d\d[a-z]?$`).Success)' == 'false'" />

<MakeDir Directories="$(XenkoNativeOutputPath)\armeabi-v7a"/>
<Exec Condition="'%(XenkoNativeCFile.Extension)' != '.cpp'" Command="&quot;$(XenkoDependenciesDir)\LLVM\clang.exe&quot; $(XenkoNativeClang) -o &quot;$(OutputObjectPath)\%(XenkoNativeCFile.Filename)_armeabi-v7a.o&quot; -c &quot;%(XenkoNativeCFile.FullPath)&quot; -DANDROID -target armv7-none-android" />

0 comments on commit 3af4664

Please sign in to comment.
You can’t perform that action at this time.