Cleanup

Author: grendello

Configuration.props

@@ -220,9 +220,4 @@
     <AndroidAbiAndRuntimeFlavor Include="@(AndroidSupportedTargetJitAbi)" AndroidRuntime="NativeAOT" />
     <AndroidAbiAndRuntimeFlavor Include="@(AndroidSupportedTargetJitAbi)" AndroidRuntime="CoreCLR" />
   </ItemGroup>
-
-   <!-- TEMPORARY: to be removed once this PR is ready to be merged -->
-  <PropertyGroup>
-    <_LocalClrDirectory Condition=" Exists('$(AndroidToolchainDirectory)\clr') ">$(AndroidToolchainDirectory)\clr</_LocalClrDirectory>
-  </PropertyGroup>
 </Project>

Makefile

@@ -15,7 +15,6 @@ PREPARE_SCENARIO =
 PREPARE_CI_PR ?= 0
 PREPARE_CI ?= 0
 PREPARE_AUTOPROVISION ?= 0
-LOCAL_CLR ?=
 
 _PREPARE_CI_MODE_PR_ARGS = --no-emoji --run-mode=CI
 _PREPARE_CI_MODE_ARGS = $(_PREPARE_CI_MODE_PR_ARGS) -a
@@ -66,10 +65,6 @@ ifeq ($(XA_FORCE_COMPONENT_REFRESH),true)
 _PREPARE_ARGS += -refresh
 endif
 
-ifneq ($(LOCAL_CLR),)
-_PREPARE_ARGS += -p:_LocalClrDirectory="$(LOCAL_CLR)"
-endif
-
 _PREPARE_ARGS += $(PREPARE_ARGS)
 
 include build-tools/scripts/msbuild.mk

build-tools/xaprepare/xaprepare/Application/KnownProperties.cs

@@ -39,7 +39,6 @@ static class KnownProperties
 		public const string JavaSdkDirectory                    = "JavaSdkDirectory";
 		public const string JdkIncludePath                      = "JdkIncludePath";
 		public const string LibZipSourceFullPath                = "LibZipSourceFullPath";
-		public const string LocalClrDirectory                   = "_LocalClrDirectory";
 		public const string ManagedRuntime                      = "ManagedRuntime";
 		public const string MicrosoftAndroidSdkOutDir           = "MicrosoftAndroidSdkOutDir";
 		public const string MonoCecilVersion                    = "MonoCecilVersion";

build-tools/xaprepare/xaprepare/Application/Properties.Defaults.cs.in

@@ -43,7 +43,6 @@ namespace Xamarin.Android.Prepare
 			properties.Add (KnownProperties.JavaSdkDirectory,                    StripQuotes (@"@JavaSdkDirectory@"));
 			properties.Add (KnownProperties.JdkIncludePath,                      StripQuotes (@"@JdkIncludePath@"));
 			properties.Add (KnownProperties.LibZipSourceFullPath,                StripQuotes (@"@LibZipSourceFullPath@"));
-            properties.Add (KnownProperties.LocalClrDirectory,                   StripQuotes (@"@_LocalClrDirectory@"));
 			properties.Add (KnownProperties.ManagedRuntime,                      StripQuotes (@"@ManagedRuntime@"));
 			properties.Add (KnownProperties.MicrosoftAndroidSdkOutDir,           StripQuotes (@"@MicrosoftAndroidSdkOutDir@"));
 			properties.Add (KnownProperties.MonoCecilVersion,                    StripQuotes ("@MonoCecilVersion@"));

build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs

@@ -250,11 +250,6 @@ static string GetNetcoreAppRuntimePath (Context ctx, string androidTarget)
 
 			static string GetCoreClrAppRuntimePath (Context ctx, string androidTarget)
 			{
-				string? localClrDir = ctx.Properties.GetValue (KnownProperties.LocalClrDirectory);
-				if (!String.IsNullOrEmpty (localClrDir)) {
-					return Path.Combine (localClrDir, "runtimes", $"android-{androidTarget}");
-				}
-
 				// TODO: The nuget id and the ref package version are guesses atm, since the CoreCLR packages don't exist yet
 				Log.Instance.Todo ("The nuget id and the ref package version are guesses atm, since the CoreCLR packages don't exist yet");
 				return Path.Combine (

build-tools/xaprepare/xaprepare/xaprepare.targets

@@ -76,7 +76,6 @@
       <Replacement Include="@JavaSdkDirectory@=$(JavaSdkDirectory)" />
       <Replacement Include="@JdkIncludePath@=$(JavaIncludePath)" />
       <Replacement Include="@LibZipSourceFullPath@=$(LibZipSourceFullPath)" />
-      <Replacement Include="@_LocalClrDirectory@=$(_LocalClrDirectory)" />
       <Replacement Include="@ManagedRuntime@=$(ManagedRuntime)" />
       <Replacement Include="@MicrosoftAndroidSdkOutDir@=$(MicrosoftAndroidSdkOutDir)" />
       <Replacement Include="@MonoCecilVersion@=$(MonoCecilVersion)" />

src/Xamarin.Android.Build.Tasks/Tasks/MaybeUseLocalClr.cs

@@ -30,7 +30,6 @@
 using Microsoft.Build.Framework;
 using Microsoft.Build.Utilities;
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using Microsoft.Android.Build.Tasks;

src/Xamarin.Android.Build.Tasks/Tasks/ResolveSdksTask.cs

@@ -27,7 +27,6 @@ public class MonoPackageManager {
 
 	public static void LoadApplication (Context context)
 	{
-		Log.w ("XAMONO", "MonoPackageManager.LoadApplication: start");
 		synchronized (lock) {
 			android.content.pm.ApplicationInfo runtimePackage = context.getApplicationInfo ();
 			String[] apks = null;
@@ -66,7 +65,8 @@ public static void LoadApplication (Context context)
 				}
 
 				//
-				// Should the order change here, src/native/runtime-base/shared-constants.hh must be updated accordingly
+				// Should the order change here, src/mono/native/runtime-base/shared-constants.hh and
+				// src/native/clr/include/constants.hh must be updated accordingly
 				//
 				String[] appDirs = new String[] {filesDir, cacheDir, dataDir};
 				boolean haveSplitApks = runtimePackage.splitSourceDirs != null && runtimePackage.splitSourceDirs.length > 0;

src/java-runtime/java/mono/android/MonoPackageManager.java

@@ -241,9 +241,9 @@ AndroidSystem::setup_environment () noexcept
 			var_value = "";
 		}
 
-//		if constexpr (Constants::is_debug_build) {
+		if constexpr (Constants::is_debug_build) {
 			log_info (LOG_DEFAULT, "Setting environment variable '{}' to '{}'", var_name, var_value);
-//		}
+		}
 
 		if (setenv (var_name, var_value, 1) < 0) {
 			log_warn (LOG_DEFAULT, "Failed to set environment variable: {}", strerror (errno));