Fix Android build on Linux

dellis1972 · Aug 26, 2024 · 9cabbfd · 9cabbfd
1 parent 205e0e0
commit 9cabbfd
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -25,7 +25,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'microsoft'
-          java-version: '11'
+          java-version: '17'
 
       - name: Disable annotations
         run: echo "::remove-matcher owner=csc::"

diff --git a/build/BuildFrameworksTasks/BuildAndroidTask.cs b/build/BuildFrameworksTasks/BuildAndroidTask.cs
@@ -7,5 +7,18 @@ public sealed class BuildAndroidTask : FrostingTask<BuildContext>
     public override bool ShouldRun(BuildContext context) => context.IsWorkloadInstalled("android");
 
     public override void Run(BuildContext context)
-        => context.DotNetPack(context.GetProjectPath(ProjectType.Framework, "Android"), context.DotNetPackSettings);
+    {
+        var arguments = new DotNetMSBuildSettings();
+        arguments.WithProperty("AndroidSdkDirectory", System.Environment.GetEnvironmentVariable ("ANDROID_HOME"));
+        arguments.WithProperty("AcceptAndroidSDKLicenses", "true");
+        arguments.WithTarget("InstallAndroidDependencies");
+        var installSettings = new DotNetBuildSettings
+        {
+            MSBuildSettings = arguments,
+            Verbosity = DotNetVerbosity.Minimal,
+            Configuration = context.DotNetPackSettings.Configuration,
+        };
+        context.DotNetBuild(context.GetProjectPath(ProjectType.Framework, "Android"), installSettings);
+        context.DotNetPack(context.GetProjectPath(ProjectType.Framework, "Android"), context.DotNetPackSettings);
+    }
 }