Skip to content

Commit 3fca451

Browse files
grendellogrendello
committed
Merge branch 'main' into native-profiling-and-debugging
* main: [Xamarin.Android.Build.Tasks] Fix issue where app will not install (dotnet#7719) Bump to dotnet/installer@779a644 8.0.100-alpha.1.23070.23 (dotnet#7728) LEGO: Merge pull request 7751 [Mono.Android] Wrap connection exceptions in HttpRequestException (dotnet#7661) [Mono.Android] Fix View.SystemUiVisibility enumification (dotnet#7730) Bump r8 from 3.3.75 to 4.0.48 (dotnet#7700) [monodroid] Prevent overlapped decompression of embedded assemblies (dotnet#7732) [xaprepare] Support arm64 emulator components (dotnet#7743) Bump SQLite to 3.40.1 (dotnet#7733) Bump to xamarin/xamarin-android-binutils/L_15.0.7-5.0.3@6721af4b (dotnet#7742) [monodroid] Replace `exit()` with `abort()` in native code (dotnet#7734) Bump to xamarin/Java.Interop/main@8a1ae57 (dotnet#7738) [build] bump `$(AndroidNet7Version)` (dotnet#7737) Bump to xamarin/Java.Interop/main@1366d99 (dotnet#7718) [Xamarin.Android.Build.Tasks] fix AndroidGenerateResourceDesigner (dotnet#7721) Bump to xamarin/monodroid@50faac94 (dotnet#7725)
2 parents 3ae0d9c + 1d7092d commit 3fca451

File tree

55 files changed

+613
-248
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+613
-248
lines changed

‎.external

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
xamarin/monodroid:main@2b9c9d01820c8df4541157f6b6116852eba73350
1+
xamarin/monodroid:main@50faac94c6a0c27864564829ac83f3988c82f8ef
22
mono/mono:2020-02@6dd9def57ce969ca04a0ecd9ef72c0a8f069112d

‎Configuration.props

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,14 @@
4747
<DebugType Condition=" '$(DebugType)' == '' ">portable</DebugType>
4848
<Deterministic Condition=" '$(Deterministic)' == '' ">True</Deterministic>
4949
<LangVersion Condition=" '$(LangVersion)' == '' ">latest</LangVersion>
50-
<AndroidNet7Version Condition=" '$(AndroidNet7Version)' == '' ">33.0.1</AndroidNet7Version>
50+
<AndroidNet7Version Condition=" '$(AndroidNet7Version)' == '' ">33.0.26</AndroidNet7Version>
5151
<AndroidNet6Version Condition=" '$(AndroidNet6Version)' == '' ">32.0.485</AndroidNet6Version>
5252
</PropertyGroup>
5353
<PropertyGroup Condition=" '$(HostOS)' == '' ">
5454
<HostOS Condition="$([MSBuild]::IsOSPlatform('windows'))">Windows</HostOS>
5555
<HostOS Condition="$([MSBuild]::IsOSPlatform('linux'))">Linux</HostOS>
5656
<HostOS Condition="$([MSBuild]::IsOSPlatform('osx'))">Darwin</HostOS>
57+
<HostOSArchitecture>$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture.ToString())</HostOSArchitecture>
5758
</PropertyGroup>
5859
<PropertyGroup>
5960
<MicrosoftAndroidSdkPackName Condition="$([MSBuild]::IsOSPlatform('windows'))">Microsoft.Android.Sdk.Windows</MicrosoftAndroidSdkPackName>
@@ -194,9 +195,9 @@
194195
<CommandLineToolsFolder Condition=" '$(CommandLineToolsFolder)' == '' ">7.0</CommandLineToolsFolder>
195196
<CommandLineToolsVersion Condition=" '$(CommandLineToolsVersion)' == '' ">8512546_latest</CommandLineToolsVersion>
196197
<CommandLineToolsBinPath Condition=" '$(CommandLineToolsBinPath)' == '' ">$(AndroidSdkFullPath)\cmdline-tools\$(CommandLineToolsFolder)\bin</CommandLineToolsBinPath>
197-
<!-- Version numbers and PkgVersion are found in https://dl-ssl.google.com/android/repository/repository2-1.xml -->
198-
<EmulatorVersion Condition=" '$(EmulatorVersion)' == '' ">8129060</EmulatorVersion>
199-
<EmulatorPkgRevision Condition=" '$(EmulatorPkgRevision)' == '' ">31.3.1</EmulatorPkgRevision>
198+
<!-- Version numbers and PkgVersion are found in https://dl-ssl.google.com/android/repository/repository2-3.xml -->
199+
<EmulatorVersion Condition=" '$(EmulatorVersion)' == '' ">9364964</EmulatorVersion>
200+
<EmulatorPkgRevision Condition=" '$(EmulatorPkgRevision)' == '' ">32.1.9</EmulatorPkgRevision>
200201
<EmulatorToolPath Condition=" '$(EmulatorToolPath)' == '' ">$(AndroidSdkFullPath)\emulator</EmulatorToolPath>
201202
<EmulatorToolExe Condition=" '$(EmulatorToolExe)' == '' ">emulator</EmulatorToolExe>
202203
<NdkBuildPath Condition=" '$(NdkBuildPath)' == '' And '$(HostOS)' != 'Windows' ">$(AndroidNdkDirectory)\ndk-build</NdkBuildPath>

‎Localize/loc/cs/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -669,24 +669,36 @@
669669
<Item ItemId=";XA1031" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
670670
<Str Cat="Text">
671671
<Val><![CDATA[The 'AndroidHttpClientHandlerType' property value '{0}' must derive from '{1}'.]D;]A;Please change the value to an assembly-qualifed type name which inherits from '{1}' or remove the property completely.]]></Val>
672+
<Tgt Cat="Text" Stat="Loc" Orig="New">
673+
<Val><![CDATA[Hodnota vlastnosti AndroidHttpClientHandlerType {0} musí být odvozena od {1}.]D;]A;Změňte hodnotu na název typu kvalifikovaného sestavení, který dědí z: {1}, případně vlastnost úplně odeberte.]]></Val>
674+
</Tgt>
672675
</Str>
673676
<Disp Icon="Str" />
674677
</Item>
675678
<Item ItemId=";XA1032" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
676679
<Str Cat="Text">
677680
<Val><![CDATA[Failed to resolve '{0}' from '{1}'. Please check your `AndroidHttpClientHandlerType` setting.]]></Val>
681+
<Tgt Cat="Text" Stat="Loc" Orig="New">
682+
<Val><![CDATA[Nepovedlo se přeložit {0} z(e) {1}. Zkontrolujte nastavení AndroidHttpClientHandlerType.]]></Val>
683+
</Tgt>
678684
</Str>
679685
<Disp Icon="Str" />
680686
</Item>
681687
<Item ItemId=";XA1033" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
682688
<Str Cat="Text">
683689
<Val><![CDATA[Could not resolve '{0}'. Please check your `AndroidHttpClientHandlerType` setting.]]></Val>
690+
<Tgt Cat="Text" Stat="Loc" Orig="New">
691+
<Val><![CDATA[Nepovedlo se přeložit {0}. Zkontrolujte nastavení AndroidHttpClientHandlerType.]]></Val>
692+
</Tgt>
684693
</Str>
685694
<Disp Icon="Str" />
686695
</Item>
687696
<Item ItemId=";XA1034" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
688697
<Str Cat="Text">
689698
<Val><![CDATA[Your project references '{0}' which uses the `_Microsoft.Android.Resource.Designer` assembly, but you do not have this feature enabled. Please set the `AndroidUseDesignerAssembly` MSBuild property to `true` in your project file.]]></Val>
699+
<Tgt Cat="Text" Stat="Loc" Orig="New">
700+
<Val><![CDATA[Váš projekt odkazuje na literál {0}, který používá sestavení _Microsoft.Android.Resource.Designer, ale tuto funkci nemáte povolenou. Nastavte vlastnost MSBuild AndroidUseDesignerAssembly v souboru projektu na hodnotu true.]]></Val>
701+
</Tgt>
690702
</Str>
691703
<Disp Icon="Str" />
692704
</Item>

‎Localize/loc/es/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -669,24 +669,36 @@
669669
<Item ItemId=";XA1031" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
670670
<Str Cat="Text">
671671
<Val><![CDATA[The 'AndroidHttpClientHandlerType' property value '{0}' must derive from '{1}'.]D;]A;Please change the value to an assembly-qualifed type name which inherits from '{1}' or remove the property completely.]]></Val>
672+
<Tgt Cat="Text" Stat="Loc" Orig="New">
673+
<Val><![CDATA[El valor de la propiedad "AndroidHttpClientHandlerType" "{0}" debe derivar de "{1}".]D;]A;Cambie el valor a un nombre de tipo de ensamblado que herede de "{1}" o quite la propiedad por completo.]]></Val>
674+
</Tgt>
672675
</Str>
673676
<Disp Icon="Str" />
674677
</Item>
675678
<Item ItemId=";XA1032" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
676679
<Str Cat="Text">
677680
<Val><![CDATA[Failed to resolve '{0}' from '{1}'. Please check your `AndroidHttpClientHandlerType` setting.]]></Val>
681+
<Tgt Cat="Text" Stat="Loc" Orig="New">
682+
<Val><![CDATA[No se pudo resolver "{0}" desde "{1}". Compruebe la configuración de "AndroidHttpClientHandlerType".]]></Val>
683+
</Tgt>
678684
</Str>
679685
<Disp Icon="Str" />
680686
</Item>
681687
<Item ItemId=";XA1033" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
682688
<Str Cat="Text">
683689
<Val><![CDATA[Could not resolve '{0}'. Please check your `AndroidHttpClientHandlerType` setting.]]></Val>
690+
<Tgt Cat="Text" Stat="Loc" Orig="New">
691+
<Val><![CDATA[No se pudo resolver "{0}". Compruebe la configuración de "AndroidHttpClientHandlerType".]]></Val>
692+
</Tgt>
684693
</Str>
685694
<Disp Icon="Str" />
686695
</Item>
687696
<Item ItemId=";XA1034" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
688697
<Str Cat="Text">
689698
<Val><![CDATA[Your project references '{0}' which uses the `_Microsoft.Android.Resource.Designer` assembly, but you do not have this feature enabled. Please set the `AndroidUseDesignerAssembly` MSBuild property to `true` in your project file.]]></Val>
699+
<Tgt Cat="Text" Stat="Loc" Orig="New">
700+
<Val><![CDATA[El proyecto hace referencia a "{0}", que usa el ensamblado "_Microsoft.Android.Resource.Designer", pero no tiene esta característica habilitada. Establezca la propiedad "AndroidUseDesignerAssembly" de MSBuild en "true" en el archivo del proyecto.]]></Val>
701+
</Tgt>
690702
</Str>
691703
<Disp Icon="Str" />
692704
</Item>

‎Localize/loc/fr/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -669,24 +669,36 @@
669669
<Item ItemId=";XA1031" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
670670
<Str Cat="Text">
671671
<Val><![CDATA[The 'AndroidHttpClientHandlerType' property value '{0}' must derive from '{1}'.]D;]A;Please change the value to an assembly-qualifed type name which inherits from '{1}' or remove the property completely.]]></Val>
672+
<Tgt Cat="Text" Stat="Loc" Orig="New">
673+
<Val><![CDATA[La valeur de la propriété « AndroidHttpClientHandlerType » « {0} » doit dériver de « {1} ».]D;]A;Veuillez remplacer la valeur par un nom de type qualifié par l’assembly qui hérite de « {1} » ou supprimez complètement la propriété.]]></Val>
674+
</Tgt>
672675
</Str>
673676
<Disp Icon="Str" />
674677
</Item>
675678
<Item ItemId=";XA1032" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
676679
<Str Cat="Text">
677680
<Val><![CDATA[Failed to resolve '{0}' from '{1}'. Please check your `AndroidHttpClientHandlerType` setting.]]></Val>
681+
<Tgt Cat="Text" Stat="Loc" Orig="New">
682+
<Val><![CDATA[Échec de la résolution de « {0} » à partir de « {1} ». Vérifiez votre paramètre `AndroidHttpClientHandlerType`.]]></Val>
683+
</Tgt>
678684
</Str>
679685
<Disp Icon="Str" />
680686
</Item>
681687
<Item ItemId=";XA1033" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
682688
<Str Cat="Text">
683689
<Val><![CDATA[Could not resolve '{0}'. Please check your `AndroidHttpClientHandlerType` setting.]]></Val>
690+
<Tgt Cat="Text" Stat="Loc" Orig="New">
691+
<Val><![CDATA[Impossible de résoudre « {0} ». Veuillez vérifier votre paramètre `AndroidHttpClientHandlerType`.]]></Val>
692+
</Tgt>
684693
</Str>
685694
<Disp Icon="Str" />
686695
</Item>
687696
<Item ItemId=";XA1034" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
688697
<Str Cat="Text">
689698
<Val><![CDATA[Your project references '{0}' which uses the `_Microsoft.Android.Resource.Designer` assembly, but you do not have this feature enabled. Please set the `AndroidUseDesignerAssembly` MSBuild property to `true` in your project file.]]></Val>
699+
<Tgt Cat="Text" Stat="Loc" Orig="New">
700+
<Val><![CDATA[Vos références de projet « {0} » qui utilise l’assembly `_Microsoft.Android.Resource.Designer`, mais cette fonctionnalité n’est pas activée. Veuillez définir la propriété MSBuild `AndroidUseDesignerAssembly` sur `true` dans votre Fichier projet.]]></Val>
701+
</Tgt>
690702
</Str>
691703
<Disp Icon="Str" />
692704
</Item>

‎Localize/loc/pl/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -669,24 +669,36 @@
669669
<Item ItemId=";XA1031" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
670670
<Str Cat="Text">
671671
<Val><![CDATA[The 'AndroidHttpClientHandlerType' property value '{0}' must derive from '{1}'.]D;]A;Please change the value to an assembly-qualifed type name which inherits from '{1}' or remove the property completely.]]></Val>
672+
<Tgt Cat="Text" Stat="Loc" Orig="New">
673+
<Val><![CDATA[Wartość właściwości „AndroidHttpClientHandlerType” „{0}” musi pochodzić od „{1}”.]D;]A;Zmień wartość na nazwę typu kwalifikowalnego zestawu, która dziedziczy po „{1}” lub całkowicie usuń właściwość.]]></Val>
674+
</Tgt>
672675
</Str>
673676
<Disp Icon="Str" />
674677
</Item>
675678
<Item ItemId=";XA1032" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
676679
<Str Cat="Text">
677680
<Val><![CDATA[Failed to resolve '{0}' from '{1}'. Please check your `AndroidHttpClientHandlerType` setting.]]></Val>
681+
<Tgt Cat="Text" Stat="Loc" Orig="New">
682+
<Val><![CDATA[Nie można rozpoznać elementu „{0}” z „{1}”. Sprawdź ustawienie „AndroidHttpClientHandlerType”.]]></Val>
683+
</Tgt>
678684
</Str>
679685
<Disp Icon="Str" />
680686
</Item>
681687
<Item ItemId=";XA1033" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
682688
<Str Cat="Text">
683689
<Val><![CDATA[Could not resolve '{0}'. Please check your `AndroidHttpClientHandlerType` setting.]]></Val>
690+
<Tgt Cat="Text" Stat="Loc" Orig="New">
691+
<Val><![CDATA[Nie można rozpoznać elementu „{0}”. Sprawdź ustawienie „AndroidHttpClientHandlerType”.]]></Val>
692+
</Tgt>
684693
</Str>
685694
<Disp Icon="Str" />
686695
</Item>
687696
<Item ItemId=";XA1034" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
688697
<Str Cat="Text">
689698
<Val><![CDATA[Your project references '{0}' which uses the `_Microsoft.Android.Resource.Designer` assembly, but you do not have this feature enabled. Please set the `AndroidUseDesignerAssembly` MSBuild property to `true` in your project file.]]></Val>
699+
<Tgt Cat="Text" Stat="Loc" Orig="New">
700+
<Val><![CDATA[Projekt odwołuje się do elementu „{0}”, który używa zestawu „_Microsoft.Android.Resource.Designer”, ale ta funkcja nie jest włączona. Ustaw właściwość MSBuild „AndroidUseDesignerAssembly” na wartość „true” w pliku projektu.]]></Val>
701+
</Tgt>
690702
</Str>
691703
<Disp Icon="Str" />
692704
</Item>

‎Localize/loc/zh-Hant/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -669,24 +669,36 @@
669669
<Item ItemId=";XA1031" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
670670
<Str Cat="Text">
671671
<Val><![CDATA[The 'AndroidHttpClientHandlerType' property value '{0}' must derive from '{1}'.]D;]A;Please change the value to an assembly-qualifed type name which inherits from '{1}' or remove the property completely.]]></Val>
672+
<Tgt Cat="Text" Stat="Loc" Orig="New">
673+
<Val><![CDATA['AndroidHttpClientHandlerType' 屬性值 '{0}' 必須衍生自 '{1}'。]D;]A;請將值變更為繼承自 '{1}' 或完全移除屬性的 assembly-qualifed 類型名稱。]]></Val>
674+
</Tgt>
672675
</Str>
673676
<Disp Icon="Str" />
674677
</Item>
675678
<Item ItemId=";XA1032" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
676679
<Str Cat="Text">
677680
<Val><![CDATA[Failed to resolve '{0}' from '{1}'. Please check your `AndroidHttpClientHandlerType` setting.]]></Val>
681+
<Tgt Cat="Text" Stat="Loc" Orig="New">
682+
<Val><![CDATA[無法從 '{0}' 解析 '{1}'。請檢查您的 'AndroidHttpClientHandlerType' 設定。]]></Val>
683+
</Tgt>
678684
</Str>
679685
<Disp Icon="Str" />
680686
</Item>
681687
<Item ItemId=";XA1033" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
682688
<Str Cat="Text">
683689
<Val><![CDATA[Could not resolve '{0}'. Please check your `AndroidHttpClientHandlerType` setting.]]></Val>
690+
<Tgt Cat="Text" Stat="Loc" Orig="New">
691+
<Val><![CDATA[無法解析 '{0}'。請檢查您的 'AndroidHttpClientHandlerType' 設定。]]></Val>
692+
</Tgt>
684693
</Str>
685694
<Disp Icon="Str" />
686695
</Item>
687696
<Item ItemId=";XA1034" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
688697
<Str Cat="Text">
689698
<Val><![CDATA[Your project references '{0}' which uses the `_Microsoft.Android.Resource.Designer` assembly, but you do not have this feature enabled. Please set the `AndroidUseDesignerAssembly` MSBuild property to `true` in your project file.]]></Val>
699+
<Tgt Cat="Text" Stat="Loc" Orig="New">
700+
<Val><![CDATA[您的專案參考 '{0}' 使用 '_Microsoft.Android.Resource.Designer' 組件，但您未啟用此功能。請將專案檔案中的 'AndroidUseDesignerAssembly' MSBuild 屬性設定為 'true'。]]></Val>
701+
</Tgt>
690702
</Str>
691703
<Disp Icon="Str" />
692704
</Item>

‎build-tools/scripts/TestApks.targets

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
<PropertyGroup>
2020
<TestAvdApiLevel Condition=" '$(TestAvdApiLevel)' == '' ">29</TestAvdApiLevel>
21+
<TestAvdAbi Condition=" '$(TestAvdAbi)' == '' and '$(HostOS)' == 'Darwin' and '$(HostOSArchitecture)' == 'Arm64' ">arm64-v8a</TestAvdAbi>
2122
<TestAvdAbi Condition=" '$(TestAvdAbi)' == '' ">x86_64</TestAvdAbi>
2223
<TestAvdType Condition=" '$(TestAvdType)' == '' ">default</TestAvdType>
2324
<TestDeviceName Condition=" '$(TestDeviceName)' == '' ">pixel_4</TestDeviceName>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace Xamarin.Android.Prepare
1515
//
1616
partial class Configurables
1717
{
18-
const string BinutilsVersion = "L_15.0.3-5.0.2";
18+
const string BinutilsVersion = "L_15.0.7-5.0.3";
1919

2020
const string MicrosoftOpenJDK11Version = "11.0.16";
2121
const string MicrosoftOpenJDK11Release = "8.1";

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System;
22
using System.Collections.Generic;
33
using System.IO;
4+
using System.Runtime.InteropServices;
45

56
namespace Xamarin.Android.Prepare
67
{
@@ -30,10 +31,14 @@ public AndroidToolchain ()
3031
string XABuildTools30PackagePrefix = Context.Instance.Properties [KnownProperties.XABuildTools30PackagePrefix] ?? String.Empty;
3132
string XAPlatformToolsVersion = GetRequiredProperty (KnownProperties.XAPlatformToolsVersion);
3233
string XAPlatformToolsPackagePrefix = Context.Instance.Properties [KnownProperties.XAPlatformToolsPackagePrefix] ?? String.Empty;
34+
bool isArm64Apple = Context.Instance.OS.Flavor == "macOS" && RuntimeInformation.OSArchitecture == Architecture.Arm64;
35+
string emulatorArch = isArm64Apple ? "aarch64" : "x64";
36+
string systemImageArch = isArm64Apple ? "arm64-v8a" : "x86_64";
3337

3438
// Upstream manifests with version information:
3539
//
3640
// https://dl-ssl.google.com/android/repository/repository2-1.xml
41+
// https://dl-ssl.google.com/android/repository/repository2-3.xml
3742
// * platform APIs
3843
// * build-tools
3944
// * command-line tools
@@ -87,10 +92,10 @@ public AndroidToolchain ()
8792
dependencyType: AndroidToolchainComponentType.BuildDependency,
8893
buildToolVersion: "47.0.0"
8994
),
90-
new AndroidToolchainComponent ($"x86_64-29_r07-{osTag}",
91-
destDir: Path.Combine ("system-images", "android-29", "default", "x86_64"),
95+
new AndroidToolchainComponent (isArm64Apple ? $"{systemImageArch}-29_r08" : $"{systemImageArch}-29_r08-{osTag}",
96+
destDir: Path.Combine ("system-images", "android-29", "default", systemImageArch),
9297
relativeUrl: new Uri ("sys-img/android/", UriKind.Relative),
93-
pkgRevision: "7",
98+
pkgRevision: "8",
9499
dependencyType: AndroidToolchainComponentType.EmulatorDependency
95100
),
96101
new AndroidToolchainComponent ($"android-ndk-r{AndroidNdkVersion}-{osTag}",
@@ -123,7 +128,7 @@ public AndroidToolchain ()
123128
buildToolName: "android-sdk-platform-tools",
124129
buildToolVersion: XAPlatformToolsVersion
125130
),
126-
new AndroidToolchainComponent ($"emulator-{osTag}_x64-{EmulatorVersion}",
131+
new AndroidToolchainComponent ($"emulator-{osTag}_{emulatorArch}-{EmulatorVersion}",
127132
destDir: "emulator",
128133
pkgRevision: EmulatorPkgRevision,
129134
dependencyType: AndroidToolchainComponentType.EmulatorDependency

0 commit comments

Comments
 (0)