Skip to content

Commit ce1717f

Browse files
jonpryorjonpryor
authored
[Mono.Android] Bind API-36.1 Beta 2 (#10497)
Context: https://developer.android.com/about/versions/16/qpr2/ Context: https://android-developers.googleblog.com/2025/09/android-16-qpr2-beta-2-is-here.html Android 16 Quarterly Platform Release 2 (QPR2) Beta 2 has been released. * [API-36.1 Beta 2 vs. API-CANARY Beta 1][0] * [API-36.1 Beta 2 vs. API-36][1] The Android 16 QPR2 [Milestones and updates][2] section indicates that Beta 2 is API stable! We're not yet ready to do the enumification work, though. Bind API-36.1 Beta 2 as an *unstable*, *un-enumified* binding. [0]: https://developer.android.com/sdk/api_diff/36.1-incr/changes [1]: https://developer.android.com/sdk/api_diff/36.1/changes [2]: https://developer.android.com/about/versions/16/qpr2/overview#timeline
1 parent 4a09dd4 commit ce1717f

File tree

12 files changed

+66299
-25747
lines changed

12 files changed

+66299
-25747
lines changed

‎Configuration.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<AndroidLatestStableFrameworkVersion Condition="'$(AndroidLatestStableFrameworkVersion)'==''">v16.0</AndroidLatestStableFrameworkVersion>
3131
<!-- *Latest* *unstable* API level binding that we support; this can be the same as *stable* -->
3232
<AndroidLatestUnstableApiLevel Condition="'$(AndroidLatestUnstableApiLevel)' == ''">36.1</AndroidLatestUnstableApiLevel>
33-
<AndroidLatestUnstablePlatformId Condition="'$(AndroidLatestUnstablePlatformId)' == ''">CANARY</AndroidLatestUnstablePlatformId>
33+
<AndroidLatestUnstablePlatformId Condition="'$(AndroidLatestUnstablePlatformId)' == ''">36.1</AndroidLatestUnstablePlatformId>
3434
<AndroidLatestUnstableFrameworkVersion Condition="'$(AndroidLatestUnstableFrameworkVersion)'==''">v16.1</AndroidLatestUnstableFrameworkVersion>
3535
<!-- The default API level used for $(TargetPlatformVersion) -->
3636
<AndroidDefaultTargetDotnetApiLevel Condition=" '$(AndroidDefaultTargetDotnetApiLevel)' == '' ">$(AndroidLatestStableApiLevel)</AndroidDefaultTargetDotnetApiLevel>

‎Documentation/workflow/HowToAddNewApiLevel.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ Then update the following files:
113113
[`/build-tools/xaprepare/xaprepare/ConfigAndData/BuildAndroidPlatforms.cs`](../../build-tools/xaprepare/xaprepare/ConfigAndData/BuildAndroidPlatforms.cs):
114114
115115
```csharp
116-
new AndroidPlatform (apiName: "CANARY", apiLevel: 36, platformID: "CANARY", include: "v16.0", framework: "v16.1"),
116+
new AndroidPlatform (apiName: "CANARY", apiLevel: new Version (36, 1), platformID: "CANARY", include: "v16.0", framework: "v16.1", stable: false),
117117
118118
```
119119
@@ -125,7 +125,7 @@ Then update the following files:
125125
[`/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs`](../../build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs):
126126
127127
```csharp
128-
new AndroidPlatformComponent ("platform-36.0-CANARY_r03", apiLevel: "CANARY", pkgRevision: "3", isLatestStable: false),
128+
new AndroidPlatformComponent ("platform-36.0-CANARY_r03", apiLevel: "CANARY", pkgRevision: "3", isLatestStable: false, isPreview: true),
129129
```
130130
131131
*Note*: the first argument is *base filename* of the package to download; `xaprepare` will automatically append `.zip`.

‎build-tools/api-merge/merge-configuration.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
<File Path="api-34.xml.in" Level="34" />
2626
<File Path="api-35.xml.in" Level="35" />
2727
<File Path="api-36.xml.in" Level="36" />
28-
<File Path="api-CANARY.xml.in" Level="36.1" />
28+
<File Path="api-36.1.xml.in" Level="36.1" />
2929
</Inputs>
3030
<Outputs>
31-
<File Path="api-CANARY.xml" LastLevel="36.1" />
31+
<File Path="api-36.1.xml" LastLevel="36.1" />
3232
</Outputs>
3333
</Configuration>

‎build-tools/create-android-api/create-android-api.csproj‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,9 @@
135135
<_JavaSourceUtilsJar>$(MicrosoftAndroidSdkOutDir)\java-source-utils.jar</_JavaSourceUtilsJar>
136136
<_SourceStubZip>$(AndroidSdkDirectory)\platforms\android-$(ParamApiLevel)\android-stubs-src.jar</_SourceStubZip>
137137
<_ParamOutputTextFile>$(MSBuildThisFileDirectory)..\..\src\Mono.Android\Profiles\api-$(ParamApiLevel).params.txt</_ParamOutputTextFile>
138-
<_ParamOutputJavadoc>$(TEMP)\api-$(ParamApiLevel).javadoc.xml</_ParamOutputJavadoc>
138+
<_TmpDir Condition=" '$(TMPDIR)' != '' ">$(TMPDIR)</_TmpDir>
139+
<_TmpDir Condition=" '$(_TmpDir)' == '' ">$(TEMP)</_TmpDir>
140+
<_ParamOutputJavadoc>$(_TmpDir)\api-$(ParamApiLevel).javadoc.xml</_ParamOutputJavadoc>
139141
</PropertyGroup>
140142

141143
<ItemGroup>
@@ -149,7 +151,8 @@
149151

150152
<Exec
151153
Command="&quot;$(JavaPath)&quot; -jar &quot;$(_JavaSourceUtilsJar)&quot; @(_JsuArg->'&quot;%(Identity)&quot;', ' ')" />
152-
154+
155+
<Delete Files="$(_ParamOutputJavadoc)" />
153156
</Target>
154157

155158
<!-- Generates 'JNIEnv.g.cs' file. We do this here because it should only run once, not per-TF. -->

‎build-tools/xaprepare/xaprepare/ConfigAndData/BuildAndroidPlatforms.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class BuildAndroidPlatforms
4747
new AndroidPlatform (apiName: "UpsideDownCake", apiLevel: 34, platformID: "34", include: "v14.0", framework: "v14.0"),
4848
new AndroidPlatform (apiName: "VanillaIceCream", apiLevel: 35, platformID: "35", include: "v15.0", framework: "v15.0"),
4949
new AndroidPlatform (apiName: "Baklava", apiLevel: 36, platformID: "36", include: "v16.0", framework: "v16.0"),
50-
new AndroidPlatform (apiName: "CANARY", apiLevel: new Version (36, 1), platformID: "CANARY", include: "v16.1", framework: "v16.1", stable: false),
50+
new AndroidPlatform (apiName: "CANARY", apiLevel: new Version (36, 1), platformID: "36.1", include: "v16.1", framework: "v16.1", stable: false),
5151
};
5252

5353
}

‎build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public AndroidToolchain ()
7474
new AndroidPlatformComponent ("platform-34-ext7_r02", apiLevel: "34", pkgRevision: "2"),
7575
new AndroidPlatformComponent ("platform-35_r02", apiLevel: "35", pkgRevision: "2"),
7676
new AndroidPlatformComponent ("platform-36_r02", apiLevel: "36", pkgRevision: "2", isLatestStable: true),
77-
new AndroidPlatformComponent ("platform-36.0-CANARY_r03", apiLevel: "CANARY", pkgRevision: "3", isLatestStable: false, isPreview: true),
77+
new AndroidPlatformComponent ("platform-36.1_r01", apiLevel: "36.1", pkgRevision: "1", isLatestStable: false, isPreview: true),
7878

7979
new AndroidToolchainComponent ("source-36_r01",
8080
destDir: Path.Combine ("sources", "android-36"),

‎src/Mono.Android/Java.Lang/Thread.cs‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -64,31 +64,6 @@ public Thread (Action runHandler, string threadName) : this (new RunnableImpleme
6464
public Thread (ThreadGroup group, Action runHandler, string threadName) : this (group, new RunnableImplementor (runHandler), threadName) {}
6565

6666
public Thread (ThreadGroup group, Action runHandler, string threadName, long stackSize) : this (group, new RunnableImplementor (runHandler), threadName, stackSize) {}
67-
68-
#if ANDROID_36_1
69-
partial interface IBuilder {
70-
partial class IOfPlatformInvoker {
71-
IBuilder? IBuilder.InheritInheritableThreadLocals (bool value) =>
72-
InheritInheritableThreadLocals (value);
73-
IBuilder? IBuilder.Name (string? name) =>
74-
Name (name);
75-
IBuilder? IBuilder.Name (string? name, long v) =>
76-
Name (name, v);
77-
IBuilder? IBuilder.UncaughtExceptionHandler (IUncaughtExceptionHandler? u) =>
78-
UncaughtExceptionHandler (u);
79-
}
80-
partial class IOfVirtualInvoker {
81-
IBuilder? IBuilder.InheritInheritableThreadLocals (bool value) =>
82-
InheritInheritableThreadLocals (value);
83-
IBuilder? IBuilder.Name (string? name) =>
84-
Name (name);
85-
IBuilder? IBuilder.Name (string? name, long v) =>
86-
Name (name, v);
87-
IBuilder? IBuilder.UncaughtExceptionHandler (IUncaughtExceptionHandler? u) =>
88-
UncaughtExceptionHandler (u);
89-
}
90-
}
91-
#endif // ANDROID_36_1
9267
}
9368
}
9469

‎src/Mono.Android/Mono.Android.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
<PropertyGroup>
2929
<IsUnstableVersion Condition=" '$(AndroidApiLevel)' &gt; '$(AndroidLatestStableApiLevel)' ">true</IsUnstableVersion>
3030
<DefineConstants Condition=" '$(IsUnstableVersion)' == 'True' ">$(DefineConstants);ANDROID_UNSTABLE</DefineConstants>
31-
<DefineConstants Condition=" '$(IsUnstableVersion)' == 'True' ">$(DefineConstants);ANDROID_36_1</DefineConstants>
3231
<OutputPath>$(_MonoAndroidNETDefaultOutDir)</OutputPath>
3332

3433
<!-- Allow PublicApiAnalyzers to be turned off -->

0 commit comments

Comments
 (0)