Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions Documentation/workflow/HowToAddNewApiLevel.md
Original file line number Diff line number Diff line change
Expand Up @@ -111,17 +111,28 @@ For the new API level, you need:

Then update the following files:

- Add new `AndroidPlatform` value to
[`/build-tools/xaprepare/xaprepare/ConfigAndData/BuildAndroidPlatforms.cs`](../../build-tools/xaprepare/xaprepare/ConfigAndData/BuildAndroidPlatforms.cs):

```csharp
new AndroidPlatform (apiName: "CANARY", apiLevel: new Version (36, 1), platformID: "CANARY", include: "v16.0", framework: "v16.1", stable: false),
- Add a new `<AndroidApiInfo>` entry to
[`/src/Mono.Android/Mono.Android.Apis.projitems`](../../src/Mono.Android/Mono.Android.Apis.projitems):

```xml
<AndroidApiInfo Include="v16.1">
<Name>CANARY</Name>
<Level>36</Level>
<VersionCodeFull>36.1</VersionCodeFull>
<Id>36.1</Id>
<Stable>True</Stable>
</AndroidApiInfo>
```

TODO: what should be done for the "mid-year" updates, as is the case for API-CANARY?
`Include` is the binding framework version (e.g. `v16.1`). `Level` is the
integer API level (`Major` of `VersionCodeFull`). `Id` is the platform ID
used to locate `android-$(Id)` directories under the Android SDK. `Stable`
should be `True`; every entry currently in the projitems uses `True`,
including preview codenames like CANARY. (Setting it to `False` would
exclude the entry from being picked as the default stable framework
version by some build-time selection logic.)

What are `include` and `framework` used for?
TODO: what should be done for the "mid-year" updates, as is the case for API-CANARY?

- Add new level to
[`/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs`](../../build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ namespace Xamarin.Android.Tools.BootstrapTasks
public class GenerateSupportedPlatforms : Task
{
/// <summary>
/// @(AndroidApiInfo) from .\bin\Build$(Configuration)\Mono.Android.Apis.projitems
/// @(AndroidApiInfo) from src\Mono.Android\Mono.Android.Apis.projitems
/// </summary>
[Required]
public ITaskItem [] AndroidApiInfo { get; set; } = [];
Expand Down
2 changes: 1 addition & 1 deletion build-tools/create-android-api/create-android-api.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<Import Project="..\..\Configuration.props" />
<Import Project="..\..\bin\Build$(Configuration)\Mono.Android.Apis.projitems" Condition="Exists('..\..\bin\Build$(Configuration)\Mono.Android.Apis.projitems')"/>
<Import Project="..\..\src\Mono.Android\Mono.Android.Apis.projitems" />

<ItemGroup>
<ProjectReference Include="..\..\external\Java.Interop\tools\class-parse\class-parse.csproj" ReferenceOutputAssembly="False" />
Expand Down
2 changes: 1 addition & 1 deletion build-tools/installers/create-installers.targets
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\scripts\XAVersionInfo.targets" />
<Import Project="..\scripts\LocalizationLanguages.projitems" />
<Import Project="..\..\bin\Build$(Configuration)\ProfileAssemblies.projitems" Condition="Exists('..\..\bin\Build$(Configuration)\ProfileAssemblies.projitems')" />
<Import Project="..\..\bin\Build$(Configuration)\Mono.Android.Apis.projitems" Condition="Exists('..\..\bin\Build$(Configuration)\Mono.Android.Apis.projitems')" />
<Import Project="..\..\src\Mono.Android\Mono.Android.Apis.projitems" />
<UsingTask AssemblyFile="$(PrepTasksAssembly)" TaskName="Xamarin.Android.BuildTools.PrepTasks.ReplaceFileContents" TaskFactory="TaskHostFactory" Runtime="NET" />
<PropertyGroup>
<FrameworkSrcDir>$(XAInstallPrefix)xbuild-frameworks\MonoAndroid\</FrameworkSrcDir>
Expand Down
5 changes: 2 additions & 3 deletions build-tools/xaprepare/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,8 @@ The files mentioned above are found in the [ConfigAndData](xaprepare/ConfigAndDa
helper methods used throughout the preparation utility code. **Be very careful** when modifying the names there as it may
break the build!
- [BuildAndroidPlatforms.cs](xaprepare/ConfigAndData/BuildAndroidPlatforms.cs)
Modified whenever a new Android platform is added, this file names all of the Android API levels along with platform/API
identifiers and .NET for Android framework names corresponding to specific API levels. The file also contains specification
of minimum NDK API levels used for all the Android device targets.
Contains the NDK release/revision constants and the minimum NDK API levels used for all the Android device targets.
The Android API level list itself lives in [`/src/Mono.Android/Mono.Android.Apis.projitems`](../../src/Mono.Android/Mono.Android.Apis.projitems).
- [CommonLicenses.cs](xaprepare/ConfigAndData/CommonLicenses.cs)
A file with constants containing paths to licenses commonly used by software .NET for Android uses. The licenses are used
when generating Third Party Notices.
Expand Down
53 changes: 0 additions & 53 deletions build-tools/xaprepare/xaprepare/Application/AndroidPlatform.cs

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System;
using System.Collections.Generic;

namespace Xamarin.Android.Prepare
{
Expand All @@ -10,47 +9,5 @@ class BuildAndroidPlatforms

public static string NdkMinimumAPI => Context.Instance.Properties.GetRequiredValue (KnownProperties.AndroidMinimumDotNetApiLevel);
public static string NdkMinimumAPILegacy32 => NdkMinimumAPI;

public static readonly List<AndroidPlatform> AllPlatforms = new List<AndroidPlatform> {
new AndroidPlatform (apiName: "", apiLevel: 1, platformID: "1"),
new AndroidPlatform (apiName: "", apiLevel: 2, platformID: "2"),
new AndroidPlatform (apiName: "", apiLevel: 3, platformID: "3"),
new AndroidPlatform (apiName: "Donut", apiLevel: 4, platformID: "4", include: "v1.6"),
new AndroidPlatform (apiName: "Eclair", apiLevel: 5, platformID: "5", include: "v2.0"),
new AndroidPlatform (apiName: "Eclair", apiLevel: 6, platformID: "6", include: "v2.0.1"),
new AndroidPlatform (apiName: "Eclair", apiLevel: 7, platformID: "7", include: "v2.1"),
new AndroidPlatform (apiName: "Froyo", apiLevel: 8, platformID: "8", include: "v2.2"),
new AndroidPlatform (apiName: "", apiLevel: 9, platformID: "9"),
new AndroidPlatform (apiName: "Gingerbread", apiLevel: 10, platformID: "10", include: "v2.3"),
new AndroidPlatform (apiName: "Honeycomb", apiLevel: 11, platformID: "11", include: "v3.0"),
new AndroidPlatform (apiName: "Honeycomb", apiLevel: 12, platformID: "12", include: "v3.1"),
new AndroidPlatform (apiName: "Honeycomb", apiLevel: 13, platformID: "13", include: "v3.2"),
new AndroidPlatform (apiName: "Ice Cream Sandwich", apiLevel: 14, platformID: "14", include: "v4.0"),
new AndroidPlatform (apiName: "Ice Cream Sandwich", apiLevel: 15, platformID: "15", include: "v4.0.3"),
new AndroidPlatform (apiName: "Jelly Bean", apiLevel: 16, platformID: "16", include: "v4.1"),
new AndroidPlatform (apiName: "Jelly Bean", apiLevel: 17, platformID: "17", include: "v4.2"),
new AndroidPlatform (apiName: "Jelly Bean", apiLevel: 18, platformID: "18", include: "v4.3"),
new AndroidPlatform (apiName: "Kit Kat", apiLevel: 19, platformID: "19", include: "v4.4"),
new AndroidPlatform (apiName: "Kit Kat + Wear support", apiLevel: 20, platformID: "20", include: "v4.4.87"),
new AndroidPlatform (apiName: "Lollipop", apiLevel: 21, platformID: "21", include: "v5.0"),
new AndroidPlatform (apiName: "Lollipop", apiLevel: 22, platformID: "22", include: "v5.1"),
new AndroidPlatform (apiName: "Marshmallow", apiLevel: 23, platformID: "23", include: "v6.0"),
new AndroidPlatform (apiName: "Nougat", apiLevel: 24, platformID: "24", include: "v7.0"),
new AndroidPlatform (apiName: "Nougat", apiLevel: 25, platformID: "25", include: "v7.1"),
new AndroidPlatform (apiName: "Oreo", apiLevel: 26, platformID: "26", include: "v8.0"),
new AndroidPlatform (apiName: "Oreo", apiLevel: 27, platformID: "27", include: "v8.1"),
new AndroidPlatform (apiName: "Pie", apiLevel: 28, platformID: "28", include: "v9.0"),
new AndroidPlatform (apiName: "Q", apiLevel: 29, platformID: "29", include: "v10.0"),
new AndroidPlatform (apiName: "R", apiLevel: 30, platformID: "30", include: "v11.0"),
new AndroidPlatform (apiName: "S", apiLevel: 31, platformID: "31", include: "v12.0"),
new AndroidPlatform (apiName: "Sv2", apiLevel: 32, platformID: "32", include: "v12.1"),
new AndroidPlatform (apiName: "Tiramisu", apiLevel: 33, platformID: "33", include: "v13.0", framework: "v13.0"),
new AndroidPlatform (apiName: "UpsideDownCake", apiLevel: 34, platformID: "34", include: "v14.0", framework: "v14.0"),
new AndroidPlatform (apiName: "VanillaIceCream", apiLevel: 35, platformID: "35", include: "v15.0", framework: "v15.0"),
new AndroidPlatform (apiName: "Baklava", apiLevel: 36, platformID: "36", include: "v16.0", framework: "v16.0"),
new AndroidPlatform (apiName: "CANARY", apiLevel: new Version (36, 1), platformID: "36.1", include: "v16.1", framework: "v16.1", stable: true),
new AndroidPlatform (apiName: "CinnamonBun", apiLevel: new Version (37, 0), platformID: "37.0", include: "v17.0", framework: "v17.0", stable: true),
};

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,7 @@ protected override async Task<bool> Execute (Context context)
if (onlyRequired)
return null;

var steps = new List <GeneratedFile> {
new GeneratedMonoAndroidProjitemsFile (),
};
var steps = new List <GeneratedFile> ();

AddOSSpecificSteps (context, steps);

Expand Down
Loading