Skip to content

Commit 71cd5ae

Browse files
committed
[api-xml-adjuster] Fix predefined managed types. (#103)
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.
1 parent e0622ee commit 71cd5ae

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

src/Xamarin.Android.Tools.ApiXmlAdjuster/JavaApi.XmlModel.cs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ public override string ToString ()
111111

112112
class ManagedType : JavaType
113113
{
114-
static JavaPackage dummy_system_package, dummy_system_io_package;
115-
static JavaType system_object, system_exception, system_io_stream;
114+
static JavaPackage dummy_system_package, dummy_system_io_package, dummy_system_xml_package;
115+
static JavaType system_object, system_exception, system_io_stream, system_xml_xmlreader;
116116

117117
static ManagedType ()
118118
{
@@ -122,14 +122,18 @@ static ManagedType ()
122122
dummy_system_package.Types.Add (system_object);
123123
dummy_system_package.Types.Add (system_exception);
124124
dummy_system_io_package = new JavaPackage (null) { Name = "System.IO" };
125-
system_io_stream = new ManagedType (dummy_system_package) { Name = "Stream" };
125+
system_io_stream = new ManagedType (dummy_system_io_package) { Name = "Stream" };
126126
dummy_system_io_package.Types.Add (system_io_stream);
127+
dummy_system_xml_package = new JavaPackage (null) { Name = "System.Xml" };
128+
system_xml_xmlreader = new ManagedType (dummy_system_xml_package) { Name = "XmlReader" };
129+
dummy_system_io_package.Types.Add (system_xml_xmlreader);
127130
}
128131

129132
public static IEnumerable<JavaPackage> DummyManagedPackages {
130133
get {
131134
yield return dummy_system_package;
132135
yield return dummy_system_io_package;
136+
yield return dummy_system_xml_package;
133137
}
134138
}
135139

0 commit comments

Comments
 (0)