Skip to content

Commit e5d04ef

Browse files
committed
Let's try to see what's going on there...
1 parent 6622023 commit e5d04ef

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public partial class BuildTest2 : BaseTest
4242
[TestCaseSource (nameof (MarshalMethodsDefaultStatusSource))]
4343
public void MarshalMethodsDefaultEnabledStatus (bool isRelease, bool marshalMethodsEnabled)
4444
{
45-
var abis = new [] { "armeabi-v7a", "x86" };
45+
var abis = new [] { "am64-v8a", "x86_64" };
4646
AndroidTargetArch[] supportedArches = new [] {
4747
AndroidTargetArch.Arm,
4848
AndroidTargetArch.X86,

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/PackagingTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ public void CheckIncludedNativeLibraries ([Values (true, false)] bool compressNa
177177
IsRelease = true,
178178
};
179179
proj.PackageReferences.Add(KnownPackages.SQLitePCLRaw_Core);
180-
proj.SetRuntimeIdentifier ("android-x64");
180+
proj.SetAndroidSupportedAbis ("x86_64");
181181
proj.SetProperty (proj.ReleaseProperties, "AndroidStoreUncompressedFileExtensions", compressNativeLibraries ? "" : "so");
182182
using (var b = CreateApkBuilder ()) {
183183
b.ThrowOnBuildFailure = false;

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/TestEnvironment.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,10 @@ orderby version descending
143143
/// </summary>
144144
public static bool UseLocalBuildOutput {
145145
get {
146+
Console.WriteLine ($"UseLocalBuildOutput: local sdk dir == '{LocalDotNetAndroidSdkDirectory}'");
146147
var msbuildDir = Path.Combine (LocalDotNetAndroidSdkDirectory, "tools");
148+
bool tasksExist = File.Exists (Path.Combine (msbuildDir, "Xamarin.Android.Build.Tasks.dll"));
149+
Console.WriteLine ($"UseLocalBuildOutput: msbuild dir == '{msbuildDir}' (tasks exist? {tasksExist})");
147150
return Directory.Exists (msbuildDir) && File.Exists (Path.Combine (msbuildDir, "Xamarin.Android.Build.Tasks.dll"));
148151
}
149152
}
@@ -176,4 +179,3 @@ static Version ParseVersion (string path)
176179
public static bool IsUsingJdk11 => AndroidSdkResolver.GetJavaSdkVersionString ().Contains ("11.0");
177180
}
178181
}
179-

0 commit comments

Comments
 (0)