Merge branch 'main' into dev/grendel/use-libc++

grendello · grendello · commit 6a5ce4c516ba · 2024-12-05T17:08:38.000+01:00
* main: [native] More C++ tweaks and changes (#9478) Add android-platform-support to .gitignore (#9590) [ci] Skip JDK install if near match is found in $(JI_JAVA_HOME) (#9585) Localized file check-in by OneLocBuild Task: Build definition ID 17928: Build ID 10653360 (#9587) Revert "Try dependabot max_length param (#9529)" Try dependabot max_length param (#9529) LEGO: Pull request (#9575) Bump to DevDiv/android-platform-support@52dd010a (#9553) Localized file check-in by OneLocBuild Task (#9574)
diff --git a/.external b/.external
@@ -1 +1 @@
-DevDiv/android-platform-support:main@c22e86517918f75cdf147b12252361d90c6577bd
+DevDiv/android-platform-support:main@52dd010acff1fa00d172609c231b7ee7b56b94a3
diff --git a/.gitignore b/.gitignore
@@ -23,6 +23,7 @@ apk-sizes-*.txt
 *~
 external/android-platform-support/
 external/monodroid/
+external/android-platform-support/
 external/mono/
 tests/api-compatibility/reference/*/*.dll
 tests/api-compatibility/reference/*/*.cs
diff --git a/Localize/loc/zh-Hant/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl b/Localize/loc/zh-Hant/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl
@@ -54,6 +54,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";APT0005" ItemType="0;.resx" PsrId="211" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Invalid file name: Filenames cannot use Java reserved words.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[檔案名稱無效: 檔案名稱不能使用 JAVA 保留字。]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";APT2264" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[This could be caused by the project exceeding the Windows maximum path length limitation. See https://learn.microsoft.com/dotnet/android/messages/apt2264 for details.]]></Val>
@@ -1223,10 +1232,13 @@
       </Item>
       <Item ItemId=";XA4236" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Cannot download Maven artifact '{0}:{1}'.]D;]A;- {2}: {3}]D;]A;- {4}: {5}]]></Val>
+          <Val><![CDATA[Cannot download Maven artifact '{0}:{1}'.]D;]A;{2}]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[無法下載 Maven 成品 '{0}:{1}'。]D;]A;- {2}: {3}]D;]A;- {4}: {5}]]></Val>
+            <Val><![CDATA[無法下載 Maven 成品 '{0}:{1}'。]D;]A;{2}]]></Val>
           </Tgt>
+          <Prev Cat="Text">
+            <Val><![CDATA[Cannot download Maven artifact '{0}:{1}'.]D;]A;- {2}: {3}]D;]A;- {4}: {5}]]></Val>
+          </Prev>
         </Str>
         <Disp Icon="Str" />
       </Item>
diff --git a/build-tools/xaprepare/xaprepare/Scenarios/Scenario_AndroidTestDependencies.cs b/build-tools/xaprepare/xaprepare/Scenarios/Scenario_AndroidTestDependencies.cs
@@ -18,7 +18,7 @@ protected Scenario_AndroidTestDependencies (string name, string description)
 		protected override void AddSteps (Context context)
 		{
 			Steps.Add (new Step_InstallDotNetPreview ());
-			Steps.Add (new Step_InstallMicrosoftOpenJDK ());
+			Steps.Add (new Step_InstallMicrosoftOpenJDK (allowJIJavaHomeMatch: true));
 			Steps.Add (new Step_Android_SDK_NDK (AndroidSdkNdkType));
 
 			// disable installation of missing programs...
diff --git a/build-tools/xaprepare/xaprepare/Steps/Step_InstallAdoptOpenJDK.cs b/build-tools/xaprepare/xaprepare/Steps/Step_InstallAdoptOpenJDK.cs
@@ -24,9 +24,13 @@ abstract partial class Step_InstallOpenJDK : StepWithDownloadProgress, IBuildInv
 			Path.Combine ("include", "jni.h"),
 		};
 
-		public Step_InstallOpenJDK (string description)
+		bool AllowJIJavaHomeMatch = false;
+
+		public Step_InstallOpenJDK (string description, bool allowJIJavaHomeMatch = false)
 			: base (description)
-		{}
+		{
+			AllowJIJavaHomeMatch = allowJIJavaHomeMatch;
+		}
 
 		protected   abstract    string  ProductName     {get;}
 		protected   abstract    string  JdkInstallDir	{get;}
@@ -55,7 +59,22 @@ protected override async Task<bool> Execute (Context context)
 				return true;
 			}
 
-			Log.StatusLine ($"{ProductName} {JdkVersion} r{JdkRelease} will be installed");
+			// Check for a JDK installed on CI with a matching major version to use for test jobs
+			var jiJavaHomeVarValue = Environment.GetEnvironmentVariable ("JI_JAVA_HOME");
+			if (AllowJIJavaHomeMatch && Directory.Exists (jiJavaHomeVarValue)) {
+				jdkInstallDir = jiJavaHomeVarValue;
+				OpenJDKExistsAndIsValid (jdkInstallDir, out installedVersion);
+				if (Version.TryParse (installedVersion, out Version? cversion) && cversion != null) {
+					if (cversion.Major == JdkVersion.Major) {
+						Log.Status ($"{ProductName} with version ");
+						Log.Status (installedVersion ?? "Unknown", ConsoleColor.Yellow);
+						Log.StatusLine (" already installed in: ", jdkInstallDir, tailColor: ConsoleColor.Cyan);
+						return true;
+					}
+				}
+			}
+
+			Log.StatusLine ($"{ProductName} {JdkVersion} r{JdkRelease} will be installed to {jdkInstallDir}");
 			Uri jdkURL = JdkUrl;
 			if (jdkURL == null)
 				throw new InvalidOperationException ($"{ProductName} URL must not be null");
@@ -196,9 +215,9 @@ bool OpenJDKExistsAndIsValid (string installDir, out string? installedVersion)
 				return false;
 			}
 
+			installedVersion = cv;
 			string xaVersionFile = Path.Combine (installDir, XAVersionInfoFile);
 			if (!File.Exists (xaVersionFile)) {
-				installedVersion = cv;
 				Log.DebugLine ($"Unable to find .NET for Android version file {xaVersionFile}");
 				return false;
 			}
@@ -215,8 +234,6 @@ bool OpenJDKExistsAndIsValid (string installDir, out string? installedVersion)
 				return false;
 			}
 
-			installedVersion = $"{cv} r{rv}";
-
 			if (!Version.TryParse (cv, out Version? cversion) || cversion == null) {
 				Log.DebugLine ($"Unable to parse {ProductName} version from: {cv}");
 				return false;
@@ -271,8 +288,8 @@ class Step_InstallMicrosoftOpenJDK : Step_InstallOpenJDK {
 
 		const string _ProductName = "Microsoft OpenJDK";
 
-		public Step_InstallMicrosoftOpenJDK ()
-			: base ($"Installing {_ProductName}")
+		public Step_InstallMicrosoftOpenJDK (bool allowJIJavaHomeMatch = false)
+			: base ($"Installing {_ProductName}", allowJIJavaHomeMatch)
 		{
 		}
 
diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.cs.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.cs.resx
@@ -140,7 +140,7 @@ Tato chyba je pravděpodobně způsobená problémem se souborem AndroidManifest
     <value>Neplatný název souboru: Musí začínat A–z, a–z nebo podtržítkem.</value>
   </data>
   <data name="APT0005" xml:space="preserve">
-    <value>Invalid file name: Filenames cannot use Java reserved words.</value>
+    <value>Neplatný název souboru: Názvy souborů nemůžou používat vyhrazená slova Java.</value>
   </data>
   <data name="XA0000_API_for_TargetFrameworkVersion" xml:space="preserve">
     <value>Nepovedlo se určit úroveň rozhraní API pro $(TargetFrameworkVersion) {0}.</value>
@@ -979,7 +979,7 @@ Pokud chcete pro sestavení z příkazového řádku použít vlastní cestu JDK
 {0} - A Maven artifact specification</comment>
   </data>
   <data name="XA4236" xml:space="preserve">
-    <value>Cannot download Maven artifact '{0}:{1}'.
+    <value>Nelze stáhnout artefakt Maven „{0}:{1}“.
 {2}</value>
     <comment>The following are literal names and should not be translated: Maven
 {0} - Maven artifact group id
diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.de.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.de.resx
@@ -140,7 +140,7 @@ Dieser Fehler wird wahrscheinlich durch ein Problem mit der Datei "AndroidManife
     <value>Ungültiger Dateiname: Er muss mit A-z oder a-z oder einem Unterstrich beginnen.</value>
   </data>
   <data name="APT0005" xml:space="preserve">
-    <value>Invalid file name: Filenames cannot use Java reserved words.</value>
+    <value>Ungültiger Dateiname: Dateinamen können keine reservierten Java-Wörter verwenden.</value>
   </data>
   <data name="XA0000_API_for_TargetFrameworkVersion" xml:space="preserve">
     <value>Die API-Ebene für $(TargetFrameworkVersion) {0} konnte nicht bestimmt werden.</value>
@@ -979,7 +979,7 @@ Um einen benutzerdefinierten JDK-Pfad für einen Befehlszeilenbuild zu verwenden
 {0} - A Maven artifact specification</comment>
   </data>
   <data name="XA4236" xml:space="preserve">
-    <value>Cannot download Maven artifact '{0}:{1}'.
+    <value>Das Maven-Artefakt „{0}:{1}“ kann nicht heruntergeladen werden.
 {2}</value>
     <comment>The following are literal names and should not be translated: Maven
 {0} - Maven artifact group id
diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.es.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.es.resx
@@ -140,7 +140,7 @@ Este error se debe probablemente a un problema con el archivo AndroidManifest.xm
     <value>Nombre de archivo no válido: debe comenzar con A-z o a-z o un guion bajo.</value>
   </data>
   <data name="APT0005" xml:space="preserve">
-    <value>Invalid file name: Filenames cannot use Java reserved words.</value>
+    <value>Nombre de archivo no válido: los nombres de archivo no pueden usar palabras reservadas de Java.</value>
   </data>
   <data name="XA0000_API_for_TargetFrameworkVersion" xml:space="preserve">
     <value>No se pudo determinar el nivel de API para $(TargetFrameworkVersion) de "{0}".</value>
@@ -979,7 +979,7 @@ Para usar una ruta de acceso de JDK personalizada para una compilación de líne
 {0} - A Maven artifact specification</comment>
   </data>
   <data name="XA4236" xml:space="preserve">
-    <value>Cannot download Maven artifact '{0}:{1}'.
+    <value>No se puede descargar el artefacto de Maven "{0}:{1}".
 {2}</value>
     <comment>The following are literal names and should not be translated: Maven
 {0} - Maven artifact group id
diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.fr.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.fr.resx
@@ -140,7 +140,7 @@ Cette erreur est probablement due à un problème avec le fichier AndroidManifes
     <value>Nom de fichier non valide : il doit commencer par A-z, a-z ou un trait de soulignement.</value>
   </data>
   <data name="APT0005" xml:space="preserve">
-    <value>Invalid file name: Filenames cannot use Java reserved words.</value>
+    <value>Nom de fichier non valide : les noms de fichiers ne peuvent pas utiliser de mots réservés Java.</value>
   </data>
   <data name="XA0000_API_for_TargetFrameworkVersion" xml:space="preserve">
     <value>Impossible de déterminer le niveau d'API pour $(TargetFrameworkVersion) '{0}'.</value>
@@ -979,7 +979,7 @@ Pour utiliser un chemin JDK personnalisé pour une build de ligne de commande, d
 {0} - A Maven artifact specification</comment>
   </data>
   <data name="XA4236" xml:space="preserve">
-    <value>Cannot download Maven artifact '{0}:{1}'.
+    <value>Impossible de télécharger l’artefact Maven '{0}:{1}'.
 {2}</value>
     <comment>The following are literal names and should not be translated: Maven
 {0} - Maven artifact group id
diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.it.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.it.resx
@@ -140,7 +140,7 @@ Questo errore è probabilmente causato da un problema con il file di AndroidMani
     <value>Nome file non valido: deve iniziare con A-z, a-z o un carattere di sottolineatura.</value>
   </data>
   <data name="APT0005" xml:space="preserve">
-    <value>Invalid file name: Filenames cannot use Java reserved words.</value>
+    <value>Nome file non valido: i nomi di file non possono usare parole riservate in Java.</value>
   </data>
   <data name="XA0000_API_for_TargetFrameworkVersion" xml:space="preserve">
     <value>Non è stato possibile determinare il livello API per $(TargetFrameworkVersion) di '{0}'.</value>
@@ -979,7 +979,7 @@ Per usare un percorso JDK personalizzato per una compilazione della riga di coma
 {0} - A Maven artifact specification</comment>
   </data>
   <data name="XA4236" xml:space="preserve">
-    <value>Cannot download Maven artifact '{0}:{1}'.
+    <value>Non è possibile scaricare l'artefatto Maven '{0}:{1}'.
 {2}</value>
     <comment>The following are literal names and should not be translated: Maven
 {0} - Maven artifact group id
diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.ja.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.ja.resx
@@ -140,7 +140,7 @@
     <value>無効なファイル名: a-z または A-Z で始まり、またはアンダースコアで始まる必要があります。</value>
   </data>
   <data name="APT0005" xml:space="preserve">
-    <value>Invalid file name: Filenames cannot use Java reserved words.</value>
+    <value>無効なファイル名: ファイル名には Java の予約語を使用できません。</value>
   </data>
   <data name="XA0000_API_for_TargetFrameworkVersion" xml:space="preserve">
     <value>'{0}' の $(TargetFrameworkVersion) の API レベルを特定できませんでした。</value>
@@ -980,7 +980,7 @@ In this message, the term "handheld app" means "app for handheld devices."
 {0} - A Maven artifact specification</comment>
   </data>
   <data name="XA4236" xml:space="preserve">
-    <value>Cannot download Maven artifact '{0}:{1}'.
+    <value>Maven 成果物 '{0}:{1}' をダウンロードできません。
 {2}</value>
     <comment>The following are literal names and should not be translated: Maven
 {0} - Maven artifact group id
diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.ko.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.ko.resx
@@ -140,7 +140,7 @@
     <value>잘못된 파일 이름: A-z 또는 a-z 또는 밑줄로 시작해야 합니다.</value>
   </data>
   <data name="APT0005" xml:space="preserve">
-    <value>Invalid file name: Filenames cannot use Java reserved words.</value>
+    <value>잘못된 파일 이름: 파일 이름은 Java 예약어를 사용할 수 없습니다.</value>
   </data>
   <data name="XA0000_API_for_TargetFrameworkVersion" xml:space="preserve">
     <value>'{0}'의 $(TargetFrameworkVersion)에 대한 API 레벨을 확인할 수 없습니다.</value>
@@ -979,7 +979,7 @@ In this message, the term "handheld app" means "app for handheld devices."
 {0} - A Maven artifact specification</comment>
   </data>
   <data name="XA4236" xml:space="preserve">
-    <value>Cannot download Maven artifact '{0}:{1}'.
+    <value>Maven 아티팩트 '{0}:{1}'을(를) 다운로드할 수 없습니다.
 {2}</value>
     <comment>The following are literal names and should not be translated: Maven
 {0} - Maven artifact group id
diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.pl.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.pl.resx
@@ -140,7 +140,7 @@ Ten błąd jest prawdopodobnie spowodowany problemem dotyczącym pliku AndroidMa
     <value>Nieprawidłowa nazwa pliku: musi zaczynać się od litery w zakresie od A-z lub a-z bądź od podkreślenia.</value>
   </data>
   <data name="APT0005" xml:space="preserve">
-    <value>Invalid file name: Filenames cannot use Java reserved words.</value>
+    <value>Nieprawidłowa nazwa pliku: nazwy plików nie mogą używać słów zastrzeżonych języka Java.</value>
   </data>
   <data name="XA0000_API_for_TargetFrameworkVersion" xml:space="preserve">
     <value>Nie można określić poziomu interfejsu API dla parametru $(TargetFrameworkVersion) elementu „{0}”.</value>
@@ -979,7 +979,7 @@ Aby użyć niestandardowej ścieżki zestawu JDK dla kompilacji wiersza poleceni
 {0} - A Maven artifact specification</comment>
   </data>
   <data name="XA4236" xml:space="preserve">
-    <value>Cannot download Maven artifact '{0}:{1}'.
+    <value>Nie można pobrać artefaktu Maven „{0}:{1}”.
 {2}</value>
     <comment>The following are literal names and should not be translated: Maven
 {0} - Maven artifact group id
diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.pt-BR.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.pt-BR.resx
@@ -140,7 +140,7 @@ Provavelmente esse erro foi causado por um problema com o arquivo AndroidManifes
     <value>Nome de arquivo inválido: ele deve começar com A-z ou a-z ou um sublinhado.</value>
   </data>
   <data name="APT0005" xml:space="preserve">
-    <value>Invalid file name: Filenames cannot use Java reserved words.</value>
+    <value>Nome de arquivo inválido: os nomes de arquivo não podem usar palavras reservadas para Java.</value>
   </data>
   <data name="XA0000_API_for_TargetFrameworkVersion" xml:space="preserve">
     <value>Não foi possível determinar o nível da API da $(TargetFrameworkVersion) de '{0}'.</value>
@@ -979,7 +979,7 @@ Para usar um caminho JDK personalizado para um build de linha de comando, defina
 {0} - A Maven artifact specification</comment>
   </data>
   <data name="XA4236" xml:space="preserve">
-    <value>Cannot download Maven artifact '{0}:{1}'.
+    <value>Não é possível baixar o artefato Maven ''{0}:{1}''.
 {2}</value>
     <comment>The following are literal names and should not be translated: Maven
 {0} - Maven artifact group id
diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.ru.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.ru.resx
@@ -140,7 +140,7 @@
     <value>Недопустимое имя файла: оно должно начинаться с букв A–z, a–z или символа подчеркивания.</value>
   </data>
   <data name="APT0005" xml:space="preserve">
-    <value>Invalid file name: Filenames cannot use Java reserved words.</value>
+    <value>Недопустимое имя файла: в именах файлов не могут использоваться зарезервированные слова Java.</value>
   </data>
   <data name="XA0000_API_for_TargetFrameworkVersion" xml:space="preserve">
     <value>Не удалось определить уровень API для $(TargetFrameworkVersion) "{0}".</value>
@@ -979,7 +979,7 @@ In this message, the term "handheld app" means "app for handheld devices."
 {0} - A Maven artifact specification</comment>
   </data>
   <data name="XA4236" xml:space="preserve">
-    <value>Cannot download Maven artifact '{0}:{1}'.
+    <value>Не удается скачать артефакт Maven "{0}:{1}".
 {2}</value>
     <comment>The following are literal names and should not be translated: Maven
 {0} - Maven artifact group id
diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.tr.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.tr.resx
@@ -140,7 +140,7 @@ Bu hata, büyük olasılıkla AndroidManifest.xml dosyasında veya kaynak kod do
     <value>Geçersiz dosya adı: A-z ya da a-z veya alt çizgi ile başlamalıdır.</value>
   </data>
   <data name="APT0005" xml:space="preserve">
-    <value>Invalid file name: Filenames cannot use Java reserved words.</value>
+    <value>Geçersiz dosya adı: Dosya adlarında Java ayrılmış sözcükleri kullanılamaz.</value>
   </data>
   <data name="XA0000_API_for_TargetFrameworkVersion" xml:space="preserve">
     <value>'{0}' değerine sahip $(TargetFrameworkVersion) için API düzeyi belirlenemedi.</value>
@@ -979,7 +979,7 @@ Bir komut satırı derlemesi için özel bir SDK yolu kullanmak için 'JavaSdkDi
 {0} - A Maven artifact specification</comment>
   </data>
   <data name="XA4236" xml:space="preserve">
-    <value>Cannot download Maven artifact '{0}:{1}'.
+    <value>'{0}:{1}' Maven yapıtı indirilemiyor.
 {2}</value>
     <comment>The following are literal names and should not be translated: Maven
 {0} - Maven artifact group id
diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.zh-Hans.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.zh-Hans.resx
@@ -140,7 +140,7 @@
     <value>文件名无效: 必须以 A-z、a-z 或下划线开头。</value>
   </data>
   <data name="APT0005" xml:space="preserve">
-    <value>Invalid file name: Filenames cannot use Java reserved words.</value>
+    <value>文件名无效: 文件名不能使用 Java 保留字。</value>
   </data>
   <data name="XA0000_API_for_TargetFrameworkVersion" xml:space="preserve">
     <value>无法确定 $(TargetFrameworkVersion) "{0}" 的 API 级别。</value>
@@ -979,7 +979,7 @@ In this message, the term "handheld app" means "app for handheld devices."
 {0} - A Maven artifact specification</comment>
   </data>
   <data name="XA4236" xml:space="preserve">
-    <value>Cannot download Maven artifact '{0}:{1}'.
+    <value>无法下载 Maven 项目“{0}:{1}”。
 {2}</value>
     <comment>The following are literal names and should not be translated: Maven
 {0} - Maven artifact group id
diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.zh-Hant.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.zh-Hant.resx
@@ -140,7 +140,7 @@
     <value>無效檔案名稱: 必須以 A-z、a-z 或底線開頭。</value>
   </data>
   <data name="APT0005" xml:space="preserve">
-    <value>Invalid file name: Filenames cannot use Java reserved words.</value>
+    <value>檔案名稱無效: 檔案名稱不能使用 JAVA 保留字。</value>
   </data>
   <data name="XA0000_API_for_TargetFrameworkVersion" xml:space="preserve">
     <value>無法判斷 '{0}' 的 $(TargetFrameworkVersion) API 層級。</value>
@@ -979,7 +979,7 @@ In this message, the term "handheld app" means "app for handheld devices."
 {0} - A Maven artifact specification</comment>
   </data>
   <data name="XA4236" xml:space="preserve">
-    <value>Cannot download Maven artifact '{0}:{1}'.
+    <value>無法下載 Maven 成品 '{0}:{1}'。
 {2}</value>
     <comment>The following are literal names and should not be translated: Maven
 {0} - Maven artifact group id

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-DevDiv/android-platform-support:main@c22e86517918f75cdf147b12252361d90c6577bd`
	`1`	`+DevDiv/android-platform-support:main@52dd010acff1fa00d172609c231b7ee7b56b94a3`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ protected Scenario_AndroidTestDependencies (string name, string description)`
`18`	`18`	`protected override void AddSteps (Context context)`
`19`	`19`	`{`
`20`	`20`	`Steps.Add (new Step_InstallDotNetPreview ());`
`21`		`- Steps.Add (new Step_InstallMicrosoftOpenJDK ());`
	`21`	`+ Steps.Add (new Step_InstallMicrosoftOpenJDK (allowJIJavaHomeMatch: true));`
`22`	`22`	`Steps.Add (new Step_Android_SDK_NDK (AndroidSdkNdkType));`
`23`	`23`
`24`	`24`	`// disable installation of missing programs...`