[build] Use $(AndroidPlatformId) when appropriate

Context: 485e39b
Context: eb08bb4
...and doubtless others...

Three MSBuild properties control the `android.jar` which is bound and
the `$(TargetFrameworkVersion)` of `Mono.Android.dll`:

  * `$(AndroidApiLevel)`: The API level that is bound.  Must be an int.
  * `$(AndroidFrameworkVersion)`: The `$(TargetFrameworkVersion)` of
    the generated `Mono.Android.dll`.  Must be *mostly* parseable by
    `System.Version` except with a leading `v`, e.g. `v10.0`.
  * `$(AndroidPlatformId)`: The "ID" of the API level.

*Most* of the time, `$(AndroidApiLevel)` and `$(AndroidPlatformId)`
will be *identical*: for API-29, they're both `29`.

Where they differ is for new *preview* API levels, such as API-R:
`$(AndroidApiLevel)` will be 30, but `$(AndroidPlatformId)` is `R`.
The distinction is important because various filesystem paths within
the Android SDK use the "id" and *not* the API level when they differ,
e.g. the API-R `android.jar` is installed into:

	$(AndroidSdkDirectory)/platforms/android-R/android.jar

We thus need to be *careful* when distinguishing between
`$(AndroidApiLevel)` and `$(AndroidPlatformId)`, using the former when
an integer is *required*, and using the latter whenever it refers to
filesystem paths.

Unfortunately, we *haven't* been careful, because these values really
only differ for ~4 months out of the year, and for only one
`$(TargetFrameworkVersion)` version.

Start bringing some sanity...and finding bugs while we do so:

`api-xml-adjuster.targets` should use `%(AndroidApiInfo.Id)` and *not*
`%(AndroidApiLevel.Level)`, as it references filesystem locations.
Consequently, `src/Mono.Android/Profiles/api-30.params.txt` must be
renamed to `src/Mono.Android/Profiles/api-R.params.txt` so that it
correctly embeds the `$(AndroidPlatformId)` value.

`Mono.Android.targets` should likewise use `$(AndroidPlatformId)` and
not `$(AndroidApiLevel)` when using filesystem paths from the SDK.

For good measure, `Mono.Android.csproj` now overrides
`$(IntermediateOutputPath)` to contain `$(AndroidPlatformId)`, because
why not (MOAR CONSISTENCY!).

These changes, unfortunately, introduce breakage, which will need to
be addressed:

*Because* API-R was installed into
`$(AndroidSdkDirectory)/platforms/android-R`, `api-versions.xml`
*was not previously used* because `Mono.Android.targets` was using
`$(AndroidApiLevel)`, and `platforms/android-30/data/api-version.xml`
does not yet exist.  (It will come June!  But not now.)  As it didn't
exist, it hit the fallback path and used
`platform-tools/api/api-versions.xml` (4cd2060).  You would *think*
this wouldn't be a problem, but the API-R `api-versions.xml` is
*missing* members relative to platform-tools, resulting in members
*missing* `RegisterAttribute.ApiSince` values, which
`Microsoft.DotNet.ApiCompat.exe` reports, e.g.:

	CannotChangeAttribute : Attribute 'Android.Runtime.RegisterAttribute' on 'Java.Lang.StringBuilder.TrimToSize()' changed from '[RegisterAttribute("trimToSize", "()V", "", ApiSince=9)]' in the contract to '[RegisterAttribute("trimToSize", "()V", "")]' in the implementation

dotnet/java-interop@568d24ac added support to allow
`generator --apiversions` to be specified multiple times.  Take
advantage of this new support to pass in the `api-versions.xml` files
from *both* `platforms/android-R` *and* `platform-tools/api` when
binding API levels > API-29.  (Attempting to do this for *all*
versions which have both resulted in bizarre API compat errors, as
the `RegisterAttribute.ApiSince` value was *cleared*. ?!)
This works around the deficiency in API-R's `api-versions.xml` and
allows us to retain correct `RegisterAttribute.ApiSince` values.

Aside: to manually build the API-R binding, use:

	msbuild /p:AndroidPlatformId=R /p:AndroidApiLevel=30 /p:AndroidFrameworkVersion=v10.0.99 src/Mono.Android/Mono.Android.csproj /v:diag > b.txt

Author: jonpryor

build-tools/api-xml-adjuster/api-xml-adjuster.targets

@@ -15,7 +15,7 @@
       </_Api>
     </ItemGroup>
     <CreateItem Include="@(_Api)"
-        AdditionalMetadata="ParameterDescription=$(_TopDir)\src\Mono.Android\Profiles\api-%(_Api.Level).params.txt;ClassParseXml=$(_OutputPath)api\api-%(_Api.Level).xml.class-parse;ApiAdjustedXml=$(_OutputPath)api\api-%(_Api.Level).xml.in">
+        AdditionalMetadata="ParameterDescription=$(_TopDir)\src\Mono.Android\Profiles\api-%(_Api.Id).params.txt;ClassParseXml=$(_OutputPath)api\api-%(_Api.Id).xml.class-parse;ApiAdjustedXml=$(_OutputPath)api\api-%(_Api.Id).xml.in">
       <Output TaskParameter="Include" ItemName="ApiFileDefinition"/>
     </CreateItem>
   </Target>

src/Mono.Android/Mono.Android.csproj

@@ -97,7 +97,7 @@
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <ImplicitlyExpandDesignTimeFacades>False</ImplicitlyExpandDesignTimeFacades>
-    <IntermediateOutputPath>$(IntermediateOutputPath)android-$(AndroidApiLevel)\</IntermediateOutputPath>
+    <IntermediateOutputPath>$(IntermediateOutputPath)android-$(AndroidPlatformId)\</IntermediateOutputPath>
   </PropertyGroup>
   <Import Project="Mono.Android.targets" />
   <PropertyGroup>

src/Mono.Android/Mono.Android.targets

@@ -79,9 +79,18 @@
       Outputs="$(IntermediateOutputPath)mcw\Mono.Android.projitems">
     <MakeDir Directories="$(IntermediateOutputPath)mcw" />
     <PropertyGroup>
-      <_ApiVersions Condition="Exists('$(AndroidSdkDirectory)\platforms\android-$(AndroidApiLevel)\data\api-versions.xml')">"$(AndroidSdkDirectory)\platforms\android-$(AndroidApiLevel)\data\api-versions.xml"</_ApiVersions>
-      <_ApiVersions Condition="'$(_ApiVersions)'==''">"$(AndroidSdkDirectory)\platform-tools\api\api-versions.xml"</_ApiVersions>
+      <_PlatformIdVersions>$(AndroidSdkDirectory)\platforms\android-$(AndroidPlatformId)\data\api-versions.xml</_PlatformIdVersions>
     </PropertyGroup>
+    <ItemGroup>
+      <_ApiVersion
+          Condition=" '$(AndroidApiLevel)' > 29 Or !Exists ('$(_PlatformIdVersions)')"
+          Include="$(AndroidSdkDirectory)\platform-tools\api\api-versions.xml"
+      />
+      <_ApiVersion
+          Condition="Exists('$(_PlatformIdVersions)')"
+          Include="$(_PlatformIdVersions)"
+      />
+    </ItemGroup>
     <PropertyGroup>
       <Generator>"$(XAInstallPrefix)xbuild\Xamarin\Android\generator.exe"</Generator>
       <_GenFlags>--public --product-version=7</_GenFlags>
@@ -91,7 +100,7 @@
       <_Fixup>--fixup=metadata</_Fixup>
       <_Enums1>--preserve-enums --enumflags=enumflags --enumfields=map.csv --enummethods=methodmap.csv</_Enums1>
       <_Enums2>--enummetadata=$(IntermediateOutputPath)mcw\enummetadata</_Enums2>
-      <_Versions>--apiversions=$(_ApiVersions)</_Versions>
+      <_Versions>@(_ApiVersion->'--apiversions="%(Identity)"', ' ')</_Versions>
       <_Annotations>--annotations="$(AndroidSdkDirectory)\platform-tools\api\annotations.zip"</_Annotations>
       <_Assembly>--assembly="Mono.Android, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"</_Assembly>
       <_TypeMap>--type-map-report=$(IntermediateOutputPath)mcw\type-mapping.txt</_TypeMap>

src/Mono.Android/Profiles/api-30.params.txt renamed to src/Mono.Android/Profiles/api-R.params.txt

@@ -1,8 +1,4 @@
 Compat issues with assembly Mono.Android:
-CannotAddAbstractMembers : Member 'Android.Telephony.CellInfo.CellIdentity' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'Android.Telephony.CellInfo.CellSignalStrength' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'Android.Telephony.CellInfo.CellIdentity.get()' is abstract in the implementation but is missing in the contract.
-CannotAddAbstractMembers : Member 'Android.Telephony.CellInfo.CellSignalStrength.get()' is abstract in the implementation but is missing in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'Android.App.Application.IActivityLifecycleCallbacks.OnActivityPostCreated(Android.App.Activity, Android.OS.Bundle)' is present in the implementation but not in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'Android.App.Application.IActivityLifecycleCallbacks.OnActivityPostDestroyed(Android.App.Activity)' is present in the implementation but not in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'Android.App.Application.IActivityLifecycleCallbacks.OnActivityPostPaused(Android.App.Activity)' is present in the implementation but not in the contract.
@@ -24,11 +20,7 @@ InterfacesShouldHaveSameMembers : Interface member 'Android.Database.ICursor.Not
 InterfacesShouldHaveSameMembers : Interface member 'Android.Database.ICursor.SetNotificationUris(Android.Content.ContentResolver, System.Collections.Generic.IList<Android.Net.Uri>)' is present in the implementation but not in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'Android.Media.AudioRecord.IOnRoutingChangedListener.Android.Media.IAudioRoutingOnRoutingChangedListener.OnRoutingChanged(Android.Media.IAudioRouting)' is present in the implementation but not in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'Android.Media.AudioTrack.IOnRoutingChangedListener.Android.Media.IAudioRoutingOnRoutingChangedListener.OnRoutingChanged(Android.Media.IAudioRouting)' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'Android.Media.MediaCas.IEventListener.OnPluginStatusUpdate(Android.Media.MediaCas, System.Int32, System.Int32)' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'Android.Media.MediaCas.IEventListener.OnResourceLost(Android.Media.MediaCas)' is present in the implementation but not in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'Android.Media.MediaCas.IEventListener.OnSessionEvent(Android.Media.MediaCas, Android.Media.MediaCas.Session, System.Int32, System.Int32, System.Byte[])' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'Android.OS.IBinder.SuggestedMaxIpcSizeBytes' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'Android.OS.IBinder.SuggestedMaxIpcSizeBytes.get()' is present in the implementation but not in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'Android.Preferences.IPreferenceDataStore.GetBoolean(System.String, System.Boolean)' is present in the implementation but not in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'Android.Preferences.IPreferenceDataStore.GetFloat(System.String, System.Single)' is present in the implementation but not in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'Android.Preferences.IPreferenceDataStore.GetInt(System.String, System.Int32)' is present in the implementation but not in the contract.
@@ -135,28 +127,14 @@ InterfacesShouldHaveSameMembers : Interface member 'Java.Util.IComparator.ThenCo
 InterfacesShouldHaveSameMembers : Interface member 'Java.Util.IComparator.ThenComparingLong(Java.Util.Functions.IToLongFunction)' is present in the implementation but not in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'Java.Util.IIterator.ForEachRemaining(Java.Util.Functions.IConsumer)' is present in the implementation but not in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'Java.Util.IList.Java.Lang.IIterable.Spliterator()' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'Java.Util.IList.Of()' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'Java.Util.IList.Of(Java.Lang.Object)' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'Java.Util.IList.Of(Java.Lang.Object, Java.Lang.Object)' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'Java.Util.IList.Of(Java.Lang.Object, Java.Lang.Object, Java.Lang.Object)' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'Java.Util.IList.Of(Java.Lang.Object, Java.Lang.Object, Java.Lang.Object, Java.Lang.Object)' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'Java.Util.IList.Of(Java.Lang.Object, Java.Lang.Object, Java.Lang.Object, Java.Lang.Object, Java.Lang.Object)' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'Java.Util.IList.Of(Java.Lang.Object, Java.Lang.Object, Java.Lang.Object, Java.Lang.Object, Java.Lang.Object, Java.Lang.Object)' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'Java.Util.IList.Of(Java.Lang.Object, Java.Lang.Object, Java.Lang.Object, Java.Lang.Object, Java.Lang.Object, Java.Lang.Object, Java.Lang.Object)' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'Java.Util.IList.Of(Java.Lang.Object, Java.Lang.Object, Java.Lang.Object, Java.Lang.Object, Java.Lang.Object, Java.Lang.Object, Java.Lang.Object, Java.Lang.Object)' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'Java.Util.IList.Of(Java.Lang.Object, Java.Lang.Object, Java.Lang.Object, Java.Lang.Object, Java.Lang.Object, Java.Lang.Object, Java.Lang.Object, Java.Lang.Object, Java.Lang.Object)' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'Java.Util.IList.Of(Java.Lang.Object, Java.Lang.Object, Java.Lang.Object, Java.Lang.Object, Java.Lang.Object, Java.Lang.Object, Java.Lang.Object, Java.Lang.Object, Java.Lang.Object, Java.Lang.Object)' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'Java.Util.IList.Of(Java.Lang.Object[])' is present in the implementation but not in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'Java.Util.IList.ReplaceAll(Java.Util.Functions.IUnaryOperator)' is present in the implementation but not in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'Java.Util.IList.Sort(Java.Util.IComparator)' is present in the implementation but not in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'Java.Util.IMap.Compute(Java.Lang.Object, Java.Util.Functions.IBiFunction)' is present in the implementation but not in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'Java.Util.IMap.ComputeIfAbsent(Java.Lang.Object, Java.Util.Functions.IFunction)' is present in the implementation but not in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'Java.Util.IMap.ComputeIfPresent(Java.Lang.Object, Java.Util.Functions.IBiFunction)' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'Java.Util.IMap.Entry(Java.Lang.Object, Java.Lang.Object)' is present in the implementation but not in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'Java.Util.IMap.ForEach(Java.Util.Functions.IBiConsumer)' is present in the implementation but not in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'Java.Util.IMap.GetOrDefault(Java.Lang.Object, Java.Lang.Object)' is present in the implementation but not in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'Java.Util.IMap.Merge(Java.Lang.Object, Java.Lang.Object, Java.Util.Functions.IBiFunction)' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'Java.Util.IMap.Of()' is present in the implementation but not in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'Java.Util.IMap.Of(Java.Lang.Object, Java.Lang.Object)' is present in the implementation but not in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'Java.Util.IMap.Of(Java.Lang.Object, Java.Lang.Object, Java.Lang.Object, Java.Lang.Object)' is present in the implementation but not in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'Java.Util.IMap.Of(Java.Lang.Object, Java.Lang.Object, Java.Lang.Object, Java.Lang.Object, Java.Lang.Object, Java.Lang.Object)' is present in the implementation but not in the contract.
@@ -249,3 +227,13 @@ InterfacesShouldHaveSameMembers : Interface member 'Java.Util.Functions.IPredica
 InterfacesShouldHaveSameMembers : Interface member 'Java.Util.Functions.IUnaryOperator.Identity()' is present in the implementation but not in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'Java.Util.Streams.ICollector.Of(Java.Util.Functions.ISupplier, Java.Util.Functions.IBiConsumer, Java.Util.Functions.IBinaryOperator, Java.Util.Functions.IFunction, Java.Util.Streams.CollectorCharacteristics[])' is present in the implementation but not in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'Java.Util.Streams.ICollector.Of(Java.Util.Functions.ISupplier, Java.Util.Functions.IBiConsumer, Java.Util.Functions.IBinaryOperator, Java.Util.Streams.CollectorCharacteristics[])' is present in the implementation but not in the contract.
+MembersMustExist : Member 'Android.Telephony.CellInfoCdma.CellIdentity.get()' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'Android.Telephony.CellInfoCdma.CellSignalStrength.get()' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'Android.Telephony.CellInfoGsm.CellIdentity.get()' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'Android.Telephony.CellInfoGsm.CellSignalStrength.get()' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'Android.Telephony.CellInfoLte.CellIdentity.get()' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'Android.Telephony.CellInfoLte.CellSignalStrength.get()' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'Android.Telephony.CellInfoTdscdma.CellIdentity.get()' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'Android.Telephony.CellInfoTdscdma.CellSignalStrength.get()' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'Android.Telephony.CellInfoWcdma.CellIdentity.get()' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'Android.Telephony.CellInfoWcdma.CellSignalStrength.get()' does not exist in the implementation but it does exist in the contract.