Skip to content

[Xamarin.Android.Build.Tasks] minSdkVersion checks on 32-bit #812

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

Merged
merged 1 commit into from
Sep 1, 2017
Merged

[Xamarin.Android.Build.Tasks] minSdkVersion checks on 32-bit #812

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
5 changes: 3 additions & 2 deletions src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = $@"<?xml version=""1.0"" encoding=""utf-8""?>
<manifest xmlns:android=""http://schemas.android.com/apk/res/android"" android:versionCode=""1"" android:versionName=""1.0"" package=""{proj.PackageName}"">
Expand All @@ -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.
Expand Down