Reduce Android.* dependencies from this not-only-about-Android repo.

atsushieno · atsushieno · commit cb161d2031ac · 2017-12-06T14:39:53.000+09:00
diff --git a/src/Java.Interop.NamingCustomAttributes/Android.App/InstrumentationAttribute.cs b/src/Java.Interop.NamingCustomAttributes/Android.App/InstrumentationAttribute.cs
diff --git a/src/Java.Interop.NamingCustomAttributes/Android.Content/BroadcastReceiverAttribute.cs b/src/Java.Interop.NamingCustomAttributes/Android.Content/BroadcastReceiverAttribute.cs
diff --git a/src/Java.Interop.NamingCustomAttributes/Android.Content/ContentProviderAttribute.cs b/src/Java.Interop.NamingCustomAttributes/Android.Content/ContentProviderAttribute.cs
diff --git a/src/Java.Interop.NamingCustomAttributes/Android.Runtime/RegisterAttribute.cs b/src/Java.Interop.NamingCustomAttributes/Android.Runtime/RegisterAttribute.cs
@@ -6,7 +6,7 @@ namespace Android.Runtime {
 #if !JCW_ONLY_TYPE_NAMES
 	public
 #endif  // !JCW_ONLY_TYPE_NAMES
-	sealed class RegisterAttribute : Attribute {
+	sealed class RegisterAttribute : Attribute, Java.Interop.IJniNameProviderAttribute {
 
 		string connector;
 		string name;
diff --git a/src/Java.Interop.NamingCustomAttributes/Java.Interop.NamingCustomAttributes.projitems b/src/Java.Interop.NamingCustomAttributes/Java.Interop.NamingCustomAttributes.projitems
@@ -9,16 +9,14 @@
     <Import_RootNamespace>Java.Interop.NamingCustomAttributes</Import_RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="$(MSBuildThisFileDirectory)Android.Content\BroadcastReceiverAttribute.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Android.Content\ContentProviderAttribute.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Android.Runtime\RegisterAttribute.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Java.Interop\ExportAttribute.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Java.Interop\ExportFieldAttribute.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Java.Interop\ExportParameterAttribute.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Java.Interop\ExportParameterKind.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Android.App\ActivityAttribute.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Android.App\ApplicationAttribute.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Android.App\ServiceAttribute.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Android.App\InstrumentationAttribute.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Java.Interop\IJniNameProviderAttribute.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Android.Runtime\RegisterAttribute.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="$(MSBuildThisFileDirectory)Android.Runtime\" />
   </ItemGroup>
 </Project>
diff --git a/src/Java.Interop.NamingCustomAttributes/Java.Interop/IJniNameProviderAttribute.cs b/src/Java.Interop.NamingCustomAttributes/Java.Interop/IJniNameProviderAttribute.cs
@@ -0,0 +1,8 @@
+﻿using System;
+namespace Java.Interop
+{
+	public interface IJniNameProviderAttribute
+	{
+		string Name { get; }
+	}
+}
diff --git a/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers/JavaCallableWrapperGenerator.cs b/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers/JavaCallableWrapperGenerator.cs
@@ -9,9 +9,7 @@
 using Mono.Cecil;
 using Mono.Cecil.Cil;
 
-using Android.App;
 using Android.Runtime;
-using Java.Interop;
 
 using Java.Interop.Tools.Cecil;
 using Java.Interop.Tools.Diagnostics;
diff --git a/src/Java.Interop.Tools.JavaCallableWrappers/Test/Android.App/ActivityAttribute.cs b/src/Java.Interop.Tools.JavaCallableWrappers/Test/Android.App/ActivityAttribute.cs
@@ -2,7 +2,7 @@
 
 namespace Android.App
 {
-	sealed partial class ActivityAttribute : Attribute {
+	sealed partial class ActivityAttribute : Attribute, Java.Interop.IJniNameProviderAttribute {
 		public string                 Name                    {get; set;}
 	}
 }
diff --git a/src/Java.Interop.Tools.JavaCallableWrappers/Test/Android.App/ApplicationAttribute.cs b/src/Java.Interop.Tools.JavaCallableWrappers/Test/Android.App/ApplicationAttribute.cs
@@ -1,7 +1,7 @@
 using System;
 
 namespace Android.App {
-	sealed partial class ApplicationAttribute : Attribute {
+	sealed partial class ApplicationAttribute : Attribute, Java.Interop.IJniNameProviderAttribute {
 		public string                 Name                    {get; set;}
 	}
 }
diff --git a/src/Java.Interop.Tools.JavaCallableWrappers/Test/Android.App/InstrumentationAttribute.cs b/src/Java.Interop.Tools.JavaCallableWrappers/Test/Android.App/InstrumentationAttribute.cs
@@ -0,0 +1,8 @@
+using System;
+
+namespace Android.App {
+	sealed partial class InstrumentationAttribute : Attribute, Java.Interop.IJniNameProviderAttribute {
+		public string Name { get; set; }
+	}
+}
+
diff --git a/src/Java.Interop.Tools.JavaCallableWrappers/Test/Android.App/ServiceAttribute.cs b/src/Java.Interop.Tools.JavaCallableWrappers/Test/Android.App/ServiceAttribute.cs
@@ -1,7 +1,7 @@
 using System;
 
 namespace Android.App {
-	sealed partial class ServiceAttribute : Attribute {
+	sealed partial class ServiceAttribute : Attribute, Java.Interop.IJniNameProviderAttribute {
 		public string                 Name                    {get; set;}
 	}
 }
diff --git a/src/Java.Interop.Tools.JavaCallableWrappers/Test/Android.Content/BroadcastReceiverAttribute.cs b/src/Java.Interop.Tools.JavaCallableWrappers/Test/Android.Content/BroadcastReceiverAttribute.cs
@@ -0,0 +1,8 @@
+using System;
+
+namespace Android.Content {
+
+	partial class BroadcastReceiverAttribute : Attribute, Java.Interop.IJniNameProviderAttribute {
+		public string Name { get; set; }
+	}
+}
diff --git a/src/Java.Interop.Tools.JavaCallableWrappers/Test/Android.Content/ContentProviderAttribute.cs b/src/Java.Interop.Tools.JavaCallableWrappers/Test/Android.Content/ContentProviderAttribute.cs
@@ -0,0 +1,8 @@
+using System;
+
+namespace Android.Content {
+
+	partial class ContentProviderAttribute : Attribute, Java.Interop.IJniNameProviderAttribute {
+		public string Name { get; set; }
+	}
+}
diff --git a/src/Java.Interop.Tools.JavaCallableWrappers/Test/Java.Interop.Tools.JavaCallableWrappers-Tests.csproj b/src/Java.Interop.Tools.JavaCallableWrappers/Test/Java.Interop.Tools.JavaCallableWrappers-Tests.csproj
@@ -39,6 +39,12 @@
     <Compile Include="Java.Interop.Tools.JavaCallableWrappers\JavaCallableWrapperGeneratorTests.cs" />
     <Compile Include="Java.Interop.Tools.JavaCallableWrappers\TypeNameMapGeneratorTests.cs" />
     <Compile Include="Java.Interop.Tools.JavaCallableWrappers\SupportDeclarations.cs" />
+    <Compile Include="Android.App\ActivityAttribute.cs" />
+    <Compile Include="Android.App\ApplicationAttribute.cs" />
+    <Compile Include="Android.App\InstrumentationAttribute.cs" />
+    <Compile Include="Android.App\ServiceAttribute.cs" />
+    <Compile Include="Android.Content\BroadcastReceiverAttribute.cs" />
+    <Compile Include="Android.Content\ContentProviderAttribute.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
@@ -63,6 +69,8 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Java.Interop.Tools.JavaCallableWrappers\" />
+    <Folder Include="Android.App\" />
+    <Folder Include="Android.Content\" />
   </ItemGroup>
   <Import Project="..\..\Java.Interop.NamingCustomAttributes\Java.Interop.NamingCustomAttributes.projitems" Label="Shared" Condition="Exists('..\..\Java.Interop.NamingCustomAttributes\Java.Interop.NamingCustomAttributes.projitems')" />
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
diff --git a/src/Java.Interop.Tools.JavaCallableWrappers/Test/Java.Interop.Tools.JavaCallableWrappers/SupportDeclarations.cs b/src/Java.Interop.Tools.JavaCallableWrappers/Test/Java.Interop.Tools.JavaCallableWrappers/SupportDeclarations.cs
@@ -11,6 +11,8 @@
 using Android.Content;
 using Android.Runtime;
 
+using RegisterAttribute = Android.Runtime.RegisterAttribute;
+
 namespace Android.App {
 
 	[Register ("android/app/Application", DoNotGenerateAcw = true)]
diff --git a/src/Java.Interop.Tools.TypeNameMappings/Java.Interop.Tools.TypeNameMappings/JavaNativeTypeManager.cs b/src/Java.Interop.Tools.TypeNameMappings/Java.Interop.Tools.TypeNameMappings/JavaNativeTypeManager.cs
@@ -4,12 +4,11 @@
 using System.Reflection;
 using System.Security.Cryptography;
 using System.Text;
-using Java.Interop;
+using Android.Runtime;
 
 #if HAVE_CECIL
 using Mono.Cecil;
 using Java.Interop.Tools.Cecil;
-using Android.Runtime;
 using Java.Interop.Tools.JavaCallableWrappers;
 #endif  // HAVE_CECIL
 
@@ -262,35 +261,8 @@ static string GetSpecialExportJniType (string typeName, ExportParameterKind expo
 		// Keep in sync with ToJniNameFromAttributes(TypeDefinition)
 		public static string ToJniNameFromAttributes (Type type)
 		{
-			var ras = (Android.Runtime.RegisterAttribute[]) type.GetCustomAttributes (typeof (Android.Runtime.RegisterAttribute), false);
-			if (ras.Length > 0 && !string.IsNullOrEmpty (ras [0].Name))
-				return ras [0].Name.Replace ('.', '/');
-
-			var aas = (Android.App.ActivityAttribute[]) type.GetCustomAttributes (typeof (Android.App.ActivityAttribute), false);
-			if (aas.Length > 0 && !string.IsNullOrEmpty (aas [0].Name))
-				return aas [0].Name.Replace ('.', '/');
-
-			var apps = (Android.App.ApplicationAttribute[]) type.GetCustomAttributes (typeof (Android.App.ApplicationAttribute), false);
-			if (apps.Length > 0 && !string.IsNullOrEmpty (apps [0].Name))
-				return apps [0].Name.Replace ('.', '/');
-
-			var sas = (Android.App.ServiceAttribute[]) type.GetCustomAttributes (typeof (Android.App.ServiceAttribute), false);
-			if (sas.Length > 0 && !string.IsNullOrEmpty (sas [0].Name))
-				return sas [0].Name.Replace ('.', '/');
-
-			var bras = (Android.Content.BroadcastReceiverAttribute[]) type.GetCustomAttributes (typeof (Android.Content.BroadcastReceiverAttribute), false);
-			if (bras.Length > 0 && !string.IsNullOrEmpty (bras [0].Name))
-				return bras [0].Name.Replace ('.', '/');
-
-			var cpas = (Android.Content.ContentProviderAttribute[]) type.GetCustomAttributes (typeof (Android.Content.ContentProviderAttribute), false);
-			if (cpas.Length > 0 && !string.IsNullOrEmpty (cpas [0].Name))
-				return cpas [0].Name.Replace ('.', '/');
-
-			var ias = (Android.App.InstrumentationAttribute[])type.GetCustomAttributes (typeof (Android.App.InstrumentationAttribute), false);
-			if (ias.Length > 0 && !string.IsNullOrEmpty (ias [0].Name))
-				return ias [0].Name.Replace ('.', '/');
-
-			return null;
+			var a = type.GetCustomAttributes ().OfType<IJniNameProviderAttribute> ().FirstOrDefault (j => !string.IsNullOrEmpty (j.Name));
+			return a == null ? null : a.Name.Replace ('.', '/');
 		}
 
 		/*
@@ -478,41 +450,25 @@ static string ToJniName (TypeDefinition type, ExportParameterKind exportKind)
 
 		static string ToJniNameFromAttributes (TypeDefinition type)
 		{
-#region CustomAttribute alternate name support
-			// ToJniName(Type) doesn't do this, as it's instead done in
-			// JNIEnv.FindClass(Type) for perf reasons.
-			var attr = type.GetCustomAttributes ("Android.Runtime.RegisterAttribute").SingleOrDefault ();
-			if (attr != null) {
-				string name = (string) attr.ConstructorArguments [0].Value;
+			#region CustomAttribute alternate name support
+			var attrs = type.CustomAttributes.Where (a => a.AttributeType.Resolve ().Interfaces.Any (it => it.InterfaceType.FullName == typeof (IJniNameProviderAttribute).FullName));
+			return attrs.Select (attr => {
+				var ap = attr.Properties.FirstOrDefault (p => p.Name == "Name");
+				string name = null;
+				if (ap.Name == null) {
+					var ca = attr.ConstructorArguments.FirstOrDefault ();
+					if (ca.Type == null || ca.Type.FullName != "System.String")
+						return null;
+					name = (string) ca.Value;
+				} else
+					name = (string) ap.Argument.Value;
 				if (!string.IsNullOrEmpty (name))
 					return name.Replace ('.', '/');
-			}
-			foreach (var attributeType in new []{
-					"Android.App.ActivityAttribute",
-					"Android.App.ApplicationAttribute",
-					"Android.App.InstrumentationAttribute",
-					"Android.App.ServiceAttribute",
-					"Android.Content.BroadcastReceiverAttribute",
-					"Android.Content.ContentProviderAttribute",
-					}) {
-				attr = type.GetCustomAttributes (attributeType).SingleOrDefault ();
-				if (attr != null) {
-					var ap = attr.Properties.FirstOrDefault (p => p.Name == "Name");
-					string name = null;
-					if (ap.Name == null) {
-						var ca = attr.ConstructorArguments.FirstOrDefault ();
-						if (ca.Type == null || ca.Type.FullName != "System.String")
-							continue;
-						name = (string) ca.Value;
-					}
-					else
-						name = (string) ap.Argument.Value;
-					if (!string.IsNullOrEmpty (name))
-						return name.Replace ('.', '/');
-				}
-			}
-#endregion
-			return null;
+				else
+					return null;
+				})
+				.FirstOrDefault (s => s != null);
+			#endregion
 		}
 
 		public static int GetArrayInfo (Mono.Cecil.TypeReference type, out Mono.Cecil.TypeReference elementType)

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace Android.App`
`4`	`4`	`{`
`5`		`- sealed partial class ActivityAttribute : Attribute {`
	`5`	`+ sealed partial class ActivityAttribute : Attribute, Java.Interop.IJniNameProviderAttribute {`
`6`	`6`	`public string Name {get; set;}`
`7`	`7`	`}`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using System;`
`2`	`2`
`3`	`3`	`namespace Android.App {`
`4`		`- sealed partial class ApplicationAttribute : Attribute {`
	`4`	`+ sealed partial class ApplicationAttribute : Attribute, Java.Interop.IJniNameProviderAttribute {`
`5`	`5`	`public string Name {get; set;}`
`6`	`6`	`}`
`7`	`7`	`}`