Cleanup

Author: grendello

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

@@ -74,11 +74,8 @@ void GenerateCompressedAssemblySources ()
 
 			void Generate (IDictionary<string, CompressedAssemblyInfo> dict)
 			{
-				var llvmAsmgen = new CompressedAssembliesNativeAssemblyGenerator (dict);
-				llvmAsmgen.Init ();
-
-				var composer = new New.CompressedAssembliesNativeAssemblyGenerator (dict);
-				LLVM.IR.LlvmIrModule compressedAssemblies = composer.Construct ();
+				var composer = new CompressedAssembliesNativeAssemblyGenerator (dict);
+				LLVMIR.LlvmIrModule compressedAssemblies = composer.Construct ();
 
 				foreach (string abi in SupportedAbis) {
 					string baseAsmFilePath = Path.Combine (EnvironmentOutputDirectory, $"compressed_assemblies.{abi.ToLowerInvariant ()}");

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

@@ -54,13 +54,13 @@ public override bool RunTask ()
 
 		void GenerateEmpty ()
 		{
-			Generate (new New.JniRemappingAssemblyGenerator (), typeReplacementsCount: 0);
+			Generate (new JniRemappingAssemblyGenerator (), typeReplacementsCount: 0);
 		}
 
 		void Generate ()
 		{
-			var typeReplacements = new List<New.JniRemappingTypeReplacement> ();
-			var methodReplacements = new List<New.JniRemappingMethodReplacement> ();
+			var typeReplacements = new List<JniRemappingTypeReplacement> ();
+			var methodReplacements = new List<JniRemappingMethodReplacement> ();
 
 			var readerSettings = new XmlReaderSettings {
 				XmlResolver = null,
@@ -74,12 +74,12 @@ void Generate ()
 				}
 			}
 
-			Generate (new New.JniRemappingAssemblyGenerator (typeReplacements, methodReplacements), typeReplacements.Count);
+			Generate (new JniRemappingAssemblyGenerator (typeReplacements, methodReplacements), typeReplacements.Count);
 		}
 
-		void Generate (New.JniRemappingAssemblyGenerator jniRemappingComposer, int typeReplacementsCount)
+		void Generate (JniRemappingAssemblyGenerator jniRemappingComposer, int typeReplacementsCount)
 		{
-			LLVM.IR.LlvmIrModule module =  jniRemappingComposer.Construct ();
+			LLVMIR.LlvmIrModule module =  jniRemappingComposer.Construct ();
 
 			foreach (string abi in SupportedAbis) {
 				string baseAsmFilePath = Path.Combine (OutputDirectory, $"jni_remap.{abi.ToLowerInvariant ()}");
@@ -99,7 +99,7 @@ void Generate (New.JniRemappingAssemblyGenerator jniRemappingComposer, int typeR
 			);
 		}
 
-		void ReadXml (XmlReader reader, List<New.JniRemappingTypeReplacement> typeReplacements, List<New.JniRemappingMethodReplacement> methodReplacements)
+		void ReadXml (XmlReader reader, List<JniRemappingTypeReplacement> typeReplacements, List<JniRemappingMethodReplacement> methodReplacements)
 		{
 			bool haveAllAttributes;
 
@@ -116,7 +116,7 @@ void ReadXml (XmlReader reader, List<New.JniRemappingTypeReplacement> typeReplac
 						continue;
 					}
 
-					typeReplacements.Add (new New.JniRemappingTypeReplacement (from, to));
+					typeReplacements.Add (new JniRemappingTypeReplacement (from, to));
 				} else if (String.Compare ("replace-method", reader.LocalName, StringComparison.Ordinal) == 0) {
 					haveAllAttributes &= GetRequiredAttribute ("source-type", out string sourceType);
 					haveAllAttributes &= GetRequiredAttribute ("source-method-name", out string sourceMethodName);
@@ -135,7 +135,7 @@ void ReadXml (XmlReader reader, List<New.JniRemappingTypeReplacement> typeReplac
 
 					string sourceMethodSignature = reader.GetAttribute ("source-method-signature");
 					methodReplacements.Add (
-						new New.JniRemappingMethodReplacement (
+						new JniRemappingMethodReplacement (
 							sourceType, sourceMethodName, sourceMethodSignature,
 							targetType, targetMethodName, isStatic
 						)

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

@@ -375,7 +375,7 @@ void AddEnvironment ()
 			bool haveRuntimeConfigBlob = !String.IsNullOrEmpty (RuntimeConfigBinFilePath) && File.Exists (RuntimeConfigBinFilePath);
 			var appConfState = BuildEngine4.GetRegisteredTaskObjectAssemblyLocal<ApplicationConfigTaskState> (ProjectSpecificTaskObjectKey (ApplicationConfigTaskState.RegisterTaskObjectKey), RegisteredTaskObjectLifetime.Build);
 			var jniRemappingNativeCodeInfo = BuildEngine4.GetRegisteredTaskObjectAssemblyLocal<GenerateJniRemappingNativeCode.JniRemappingNativeCodeInfo> (ProjectSpecificTaskObjectKey (GenerateJniRemappingNativeCode.JniRemappingNativeCodeInfoKey), RegisteredTaskObjectLifetime.Build);
-			var appConfigAsmGen = new New.ApplicationConfigNativeAssemblyGenerator (environmentVariables, systemProperties, Log) {
+			var appConfigAsmGen = new ApplicationConfigNativeAssemblyGenerator (environmentVariables, systemProperties, Log) {
 				UsesMonoAOT = usesMonoAOT,
 				UsesMonoLLVM = EnableLLVM,
 				UsesAssemblyPreload = environmentParser.UsesAssemblyPreload,
@@ -394,7 +394,7 @@ void AddEnvironment ()
 				// and up to 4 other for arch-specific assemblies. Only **one** arch-specific store is ever loaded on the app
 				// runtime, thus the number 2 here. All architecture specific stores contain assemblies with the same names
 				// and in the same order.
-				MonoComponents = (New.MonoComponent)monoComponents,
+				MonoComponents = (MonoComponent)monoComponents,
 				NativeLibraries = uniqueNativeLibraries,
 				HaveAssemblyStore = UseAssemblyStore,
 				AndroidRuntimeJNIEnvToken = android_runtime_jnienv_class_token,
@@ -404,23 +404,23 @@ void AddEnvironment ()
 				JniRemappingReplacementMethodIndexEntryCount = jniRemappingNativeCodeInfo == null ? 0 : jniRemappingNativeCodeInfo.ReplacementMethodIndexEntryCount,
 				MarshalMethodsEnabled = EnableMarshalMethods,
 			};
-			LLVM.IR.LlvmIrModule appConfigModule = appConfigAsmGen.Construct ();
+			LLVMIR.LlvmIrModule appConfigModule = appConfigAsmGen.Construct ();
 
 			var marshalMethodsState = BuildEngine4.GetRegisteredTaskObjectAssemblyLocal<MarshalMethodsState> (ProjectSpecificTaskObjectKey (GenerateJavaStubs.MarshalMethodsRegisterTaskKey), RegisteredTaskObjectLifetime.Build);
-			New.MarshalMethodsNativeAssemblyGenerator marshalMethodsAsmGenNew;
+			MarshalMethodsNativeAssemblyGenerator marshalMethodsAsmGen;
 
 			if (enableMarshalMethods) {
-				marshalMethodsAsmGenNew = new New.MarshalMethodsNativeAssemblyGenerator (
+				marshalMethodsAsmGen = new MarshalMethodsNativeAssemblyGenerator (
 					assemblyCount,
 					uniqueAssemblyNames,
 					marshalMethodsState?.MarshalMethods,
 					Log,
 					mmTracingMode
 				);
 			} else {
-				marshalMethodsAsmGenNew = new New.MarshalMethodsNativeAssemblyGenerator (assemblyCount, uniqueAssemblyNames);
+				marshalMethodsAsmGen = new MarshalMethodsNativeAssemblyGenerator (assemblyCount, uniqueAssemblyNames);
 			}
-			LLVM.IR.LlvmIrModule marshalMethodsModule = marshalMethodsAsmGenNew.Construct ();
+			LLVMIR.LlvmIrModule marshalMethodsModule = marshalMethodsAsmGen.Construct ();
 
 			foreach (string abi in SupportedAbis) {
 				string targetAbi = abi.ToLowerInvariant ();
@@ -443,7 +443,7 @@ void AddEnvironment ()
 
 				using (var sw = MemoryStreamPool.Shared.CreateStreamWriter ()) {
 					try {
-						marshalMethodsAsmGenNew.Generate (marshalMethodsModule, targetArch, sw, marshalMethodsLlFilePath);
+						marshalMethodsAsmGen.Generate (marshalMethodsModule, targetArch, sw, marshalMethodsLlFilePath);
 					} catch {
 						throw;
 					} finally {