diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs index 7eab656f9d5..b8edb54f55a 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs @@ -210,7 +210,8 @@ public void BuildAotApplication (string supportedAbis, bool enableLLVM, bool exp proj.SetProperty (KnownProperties.TargetFrameworkVersion, "v5.1"); proj.SetProperty (KnownProperties.AndroidSupportedAbis, supportedAbis); proj.SetProperty ("EnableLLVM", enableLLVM.ToString ()); - if (enableLLVM) { + bool checkMinLlvmPath = enableLLVM && (supportedAbis == "armeabi-v7a" || supportedAbis == "x86"); + if (checkMinLlvmPath) { // Set //uses-sdk/@android:minSdkVersion so that LLVM uses the right libc.so proj.AndroidManifest = $@" @@ -225,7 +226,7 @@ public void BuildAotApplication (string supportedAbis, bool enableLLVM, bool exp Assert.AreEqual (expectedResult, b.Build (proj), "Build should have {0}.", expectedResult ? "succeeded" : "failed"); if (!expectedResult) return; - if (enableLLVM) { + if (checkMinLlvmPath) { // LLVM passes a direct path to libc.so, and we need to use the libc.so // which corresponds to the *minimum* SDK version specified in AndroidManifest.xml // Since we overrode minSdkVersion=10, that means we should use libc.so from android-9.