Skip to content
This repository was archived by the owner on Jun 20, 2023. It is now read-only.

Commit 4b74c2a

Browse files
committed
Commit typeforwards from GenAPI directly
GenAPI is a very brittle tool, especially to have run xplat. Since we don't anticipate doing these typeforwards again as Android Support 28.x is the last support library version that will be released, we are going to just manually commit the generated typeforwards this one time, and make it so that msbuild target won't actually run on build. This resolves some headaches of trying to make something work that won't be needed (at least in the same way) again.
1 parent 9ed7228 commit 4b74c2a

File tree

7 files changed

+230
-1
lines changed

7 files changed

+230
-1
lines changed

source/AndroidSupportProject.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@
163163
</ItemGroup>
164164
}
165165

166-
@if (@Model.NuGetPackageId == "Xamarin.Android.Support.v4")
166+
@if (1==2 && @Model.NuGetPackageId == "Xamarin.Android.Support.v4")
167167
{
168168
<Target Name="AndroidSupportLibrariesTypeForwardersGenerationWithGenAPI" BeforeTargets="Build">
169169
<Message Text="AndroidSupportLibrariesTypeForwardersGenerationWithGenAPI" ></Message>

source/com.android.support/support-compat/transforms/Metadata.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
<metadata>
22

33
<attr path="/api/package[@name='android.support.compat']" name="managedName">Android.Support.Compat</attr>
4+
<attr path="/api/package[@name='androidx.core.graphics.drawable']" name="managedName">AndroidX.Core.Graphics.Drawable</attr>
5+
<attr path="/api/package[@name='androidx.core.internal']" name="managedName">AndroidX.Core.Internal</attr>
6+
47

58
<!-- Fix params for some inherited parcelable types -->
69
<attr path="/api/*/*/method[@name='newArray']/parameter[@name='p0']" name="managedName">size</attr>

source/com.android.support/support-v4/additions/Xamarin.Android.Support.Compat.cs

Lines changed: 185 additions & 0 deletions
Large diffs are not rendered by default.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(Android.Support.V4.App.ActionBarDrawerToggle))]
2+
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(Android.Support.V4.Widget.Space))]
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(Android.Support.V4.Content.WakefulBroadcastReceiver))]
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(Android.Support.V4.App.DialogFragment))]
2+
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(Android.Support.V4.App.Fragment))]
3+
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(Android.Support.V4.App.FragmentActivity))]
4+
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(Android.Support.V4.App.FragmentContainer))]
5+
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(Android.Support.V4.App.FragmentController))]
6+
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(Android.Support.V4.App.FragmentHostCallback))]
7+
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(Android.Support.V4.App.FragmentManager))]
8+
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(Android.Support.V4.App.FragmentManagerNonConfig))]
9+
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(Android.Support.V4.App.FragmentPagerAdapter))]
10+
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(Android.Support.V4.App.FragmentStatePagerAdapter))]
11+
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(Android.Support.V4.App.FragmentTabHost))]
12+
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(Android.Support.V4.App.FragmentTransaction))]
13+
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(Android.Support.V4.App.FragmentTransitionImpl))]
14+
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(Android.Support.V4.App.ListFragment))]
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(Android.Support.V4.Media.AudioAttributesCompat))]
2+
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(Android.Support.V4.Media.MediaBrowserCompat))]
3+
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(Android.Support.V4.Media.MediaBrowserCompatUtils))]
4+
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(Android.Support.V4.Media.MediaBrowserProtocol))]
5+
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(Android.Support.V4.Media.MediaBrowserServiceCompat))]
6+
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(Android.Support.V4.Media.MediaDescriptionCompat))]
7+
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(Android.Support.V4.Media.MediaMetadataCompat))]
8+
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(Android.Support.V4.Media.MediaSessionManager))]
9+
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(Android.Support.V4.Media.RatingCompat))]
10+
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(Android.Support.V4.Media.VolumeProviderCompat))]
11+
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(Android.Support.V4.Media.App.NotificationCompat))]
12+
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(Android.Support.V4.Media.Session.IMediaControllerCallback))]
13+
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(Android.Support.V4.Media.Session.IMediaControllerCallbackExtensions))]
14+
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(Android.Support.V4.Media.Session.IMediaSession))]
15+
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(Android.Support.V4.Media.Session.MediaButtonReceiver))]
16+
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(Android.Support.V4.Media.Session.MediaControllerCallbackStub))]
17+
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(Android.Support.V4.Media.Session.MediaControllerCompat))]
18+
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(Android.Support.V4.Media.Session.MediaSessionCompat))]
19+
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(Android.Support.V4.Media.Session.MediaSessionCompatIMediaSessionImplExtensions))]
20+
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(Android.Support.V4.Media.Session.MediaSessionStub))]
21+
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(Android.Support.V4.Media.Session.ParcelableVolumeInfo))]
22+
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(Android.Support.V4.Media.Session.PlaybackStateCompat))]
23+
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(AndroidX.Media.AudioAttributesCompatParcelizer))]
24+
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(AndroidX.Media.AudioAttributesImplBaseParcelizer))]

0 commit comments

Comments
 (0)