From 7ac79955f87c5e0d0b9c9abf17ae2c8bb55ee975 Mon Sep 17 00:00:00 2001 From: Atsushi Eno Date: Fri, 18 Nov 2016 00:51:43 +0900 Subject: [PATCH] [api-xml-adjuster] fix predefined managed types. ApiXmlAdjuster had been emitting red-herring warning that it cannot find System.IO.Stream. It is not a Java type so it is by nature that it is not found, but we had predefined type definition for that. Turned out that it was assigned a wrong "package" and therefore the type was never resolved. This fixes it to the right package. Also, XmlReader could be used as a predefined type because it is mapped from XmlPullParser (and AndroidResourceParser). So add it too. --- .../JavaApi.XmlModel.cs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/Xamarin.Android.Tools.ApiXmlAdjuster/JavaApi.XmlModel.cs b/src/Xamarin.Android.Tools.ApiXmlAdjuster/JavaApi.XmlModel.cs index f9981cc16..c6fc86961 100644 --- a/src/Xamarin.Android.Tools.ApiXmlAdjuster/JavaApi.XmlModel.cs +++ b/src/Xamarin.Android.Tools.ApiXmlAdjuster/JavaApi.XmlModel.cs @@ -111,8 +111,8 @@ public override string ToString () class ManagedType : JavaType { - static JavaPackage dummy_system_package, dummy_system_io_package; - static JavaType system_object, system_exception, system_io_stream; + static JavaPackage dummy_system_package, dummy_system_io_package, dummy_system_xml_package; + static JavaType system_object, system_exception, system_io_stream, system_xml_xmlreader; static ManagedType () { @@ -122,14 +122,18 @@ static ManagedType () dummy_system_package.Types.Add (system_object); dummy_system_package.Types.Add (system_exception); dummy_system_io_package = new JavaPackage (null) { Name = "System.IO" }; - system_io_stream = new ManagedType (dummy_system_package) { Name = "Stream" }; + system_io_stream = new ManagedType (dummy_system_io_package) { Name = "Stream" }; dummy_system_io_package.Types.Add (system_io_stream); + dummy_system_xml_package = new JavaPackage (null) { Name = "System.Xml" }; + system_xml_xmlreader = new ManagedType (dummy_system_xml_package) { Name = "XmlReader" }; + dummy_system_io_package.Types.Add (system_xml_xmlreader); } public static IEnumerable DummyManagedPackages { get { yield return dummy_system_package; yield return dummy_system_io_package; + yield return dummy_system_xml_package; } }