[build] Bump Android SDK component versions (#8510)

Context: dotnet/android-tools#218 Changes: * xamarin/monodroid@44b5ccb0a: Bump external/xamarin-android from `81001af` to `2cfcca9` * xamarin/monodroid@0b648bfde: Bump external/android-sdk-installer from `4b2541e` to `ac2bd9a` * xamarin/monodroid@90cbf0080: Bump tools/msbuild/external/androidtools from `dcb3b12` to `352675a` * xamarin/monodroid@fb80e82e6: Bump external/xamarin-android from `1331aa2` to `81001af` * xamarin/monodroid@b042d818a: Bump external/xamarin-android from `fff1f4c` to `1331aa2` Changes: * dotnet/android-tools@08a6990 Bump android-sdk NDK version to 26.1.10909125 * dotnet/android-tools@6ae1f2a Bump android-sdk build-tool version to 34.0.0 * dotnet/android-tools@184b6b3 Bump android-sdk cmdline-tools to version 11.0 * dotnet/android-tools@1365e33 Bump android-sdk platforms-tools to version 34.0.5 * dotnet/android-tools@8d38281 Update the maximum NDK version to 26 Updates our recommended Android SDK component versions to the following: * build-tools 34.0.0 * cmdline-tools 11.0 * platform-tools 34.0.5 * android-ndk 26.1.10909125 All PR test jobs have been updated to use JDK 17, while one nightly test job will remain on JDK 11.
dotnet · Nov 29, 2023 · 490737c · 490737c
1 parent c0aefea
commit 490737c
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 28 deletions.
diff --git a/.external b/.external
@@ -1 +1 @@
-xamarin/monodroid:main@c5f1e77bc732dc660090a8d59048f07de846ccd7
+xamarin/monodroid:main@44b5ccb0ae4a7316e93040289832c74230b5217f
diff --git a/Configuration.props b/Configuration.props
@@ -120,7 +120,7 @@
     <XABuildToolsVersion>34</XABuildToolsVersion>
     <XABuildToolsFolder Condition="'$(XABuildToolsFolder)' == ''">34.0.0</XABuildToolsFolder>
     <XAPlatformToolsPackagePrefix Condition=" '$(HostOS)' == 'Darwin' "></XAPlatformToolsPackagePrefix>
-    <XAPlatformToolsVersion>34.0.1</XAPlatformToolsVersion>
+    <XAPlatformToolsVersion>34.0.5</XAPlatformToolsVersion>
     <XABundleToolVersion Condition="'$(XABundleToolVersion)' == ''">1.15.1</XABundleToolVersion>
     <XAPackagesDir Condition=" '$(XAPackagesDir)' == '' And '$(NUGET_PACKAGES)' != ''">$(NUGET_PACKAGES)</XAPackagesDir>
     <XAPackagesDir Condition=" '$(XAPackagesDir)' == '' And '$(HostOS)' == 'Windows'">$(userprofile)\.nuget\packages</XAPackagesDir>
@@ -154,8 +154,8 @@
     <AvdManagerToolExe Condition=" '$(AvdManagerToolExe)' == '' and '$(HostOS)' == 'Windows' ">avdmanager.bat</AvdManagerToolExe>
     <AndroidToolPath Condition=" '$(AndroidToolPath)' == '' ">$(AndroidSdkFullPath)\tools</AndroidToolPath>
     <AndroidToolsBinPath Condition=" '$(AndroidToolsBinPath)' == '' ">$(AndroidToolPath)\bin</AndroidToolsBinPath>
-    <CommandLineToolsFolder Condition=" '$(CommandLineToolsFolder)' == '' ">7.0</CommandLineToolsFolder>
-    <CommandLineToolsVersion Condition=" '$(CommandLineToolsVersion)' == '' ">8512546_latest</CommandLineToolsVersion>
+    <CommandLineToolsFolder Condition=" '$(CommandLineToolsFolder)' == '' ">11.0</CommandLineToolsFolder>
+    <CommandLineToolsVersion Condition=" '$(CommandLineToolsVersion)' == '' ">10406996_latest</CommandLineToolsVersion>
     <CommandLineToolsBinPath Condition=" '$(CommandLineToolsBinPath)' == '' ">$(AndroidSdkFullPath)\cmdline-tools\$(CommandLineToolsFolder)\bin</CommandLineToolsBinPath>
     <!-- Version numbers and PkgVersion are found in https://dl-ssl.google.com/android/repository/repository2-3.xml -->
     <EmulatorVersion Condition=" '$(EmulatorVersion)' == '' ">9364964</EmulatorVersion>

diff --git a/build-tools/automation/azure-pipelines-nightly.yaml b/build-tools/automation/azure-pipelines-nightly.yaml
@@ -118,6 +118,7 @@ stages:
         restoreNUnitConsole: false
         updateMono: false
         xaprepareScenario: EmulatorTestDependencies
+        jdkTestFolder: $(JAVA_HOME_11_X64)
 
     - template: yaml-templates/run-dotnet-preview.yaml
       parameters:
@@ -126,9 +127,6 @@ stages:
         displayName: prepare java.interop $(XA.Build.Configuration)
         continueOnError: false
 
-    - script: echo "##vso[task.setvariable variable=Java8SdkDirectory]$JAVA_HOME_8_X64"
-      displayName: set Java8SdkDirectory
-
     - template: yaml-templates/start-stop-emulator.yaml
       parameters:
         specificImage: true
@@ -158,6 +156,7 @@ stages:
       emulatorMSBuildArgs: -p:TestAvdExtraBootArgs=-writable-system
       jobName: SystemApplicationTests
       jobTimeout: 120
+      jdkTestFolder: $HOME/android-toolchain/jdk-17
       testSteps:
       - template: run-nunit-tests.yaml
         parameters:
@@ -190,13 +189,18 @@ stages:
     steps:
     - template: agent-cleanser/v1.yml@yaml-templates
 
+    - script: |
+        echo "##vso[task.setvariable variable=JAVA_HOME]$HOME/android-toolchain/jdk-17"
+      displayName: set JAVA_HOME to $HOME/android-toolchain/jdk-17
+
     - template: yaml-templates/setup-test-environment.yaml
       parameters:
         installTestSlicer: true
         installLegacyDotNet: false
         restoreNUnitConsole: false
         updateMono: false
         xaprepareScenario: EmulatorTestDependencies
+        jdkTestFolder: $HOME/android-toolchain/jdk-17
 
     - task: DownloadPipelineArtifact@2
       inputs:
@@ -243,13 +247,18 @@ stages:
     steps:
     - template: agent-cleanser/v1.yml@yaml-templates
 
+    - script: |
+        echo "##vso[task.setvariable variable=JAVA_HOME]$HOME/android-toolchain/jdk-17"
+      displayName: set JAVA_HOME to $HOME/android-toolchain/jdk-17
+
     - template: yaml-templates/setup-test-environment.yaml
       parameters:
         installTestSlicer: true
         installLegacyDotNet: false
         restoreNUnitConsole: false
         updateMono: false
         xaprepareScenario: EmulatorTestDependencies
+        jdkTestFolder: $HOME/android-toolchain/jdk-17
 
     - task: DownloadPipelineArtifact@2
       inputs:

diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml
@@ -350,9 +350,9 @@ stages:
         forceReinstallCredentialProvider: true
 
     - script: |
-        echo ##vso[task.setvariable variable=JI_JAVA_HOME]%JAVA_HOME_11_X64%
-        echo ##vso[task.setvariable variable=JAVA_HOME]%JAVA_HOME_11_X64%
-      displayName: set JI_JAVA_HOME, JAVA_HOME
+        echo ##vso[task.setvariable variable=JI_JAVA_HOME]%JAVA_HOME_17_X64%
+        echo ##vso[task.setvariable variable=JAVA_HOME]%JAVA_HOME_17_X64%
+      displayName: set JI_JAVA_HOME, JAVA_HOME to $(JAVA_HOME_17_X64)
 
     - task: DownloadPipelineArtifact@2
       inputs:

diff --git a/build-tools/automation/yaml-templates/build-windows.yaml b/build-tools/automation/yaml-templates/build-windows.yaml
@@ -38,8 +38,8 @@ stages:
     - template: clean.yaml
 
     - script: |
-        echo ##vso[task.setvariable variable=JI_JAVA_HOME]%JAVA_HOME_11_X64%
-      displayName: set JI_JAVA_HOME
+        echo ##vso[task.setvariable variable=JI_JAVA_HOME]%JAVA_HOME_17_X64%
+      displayName: set JI_JAVA_HOME to $(JAVA_HOME_17_X64)
 
     - template: use-dot-net.yaml
       parameters:

diff --git a/build-tools/automation/yaml-templates/run-emulator-tests.yaml b/build-tools/automation/yaml-templates/run-emulator-tests.yaml
@@ -4,6 +4,7 @@ parameters:
   emulatorMSBuildArgs: ''
   jobName: CheckTimeZoneInfoIsCorrectNode1
   jobTimeout: 360
+  jdkTestFolder: $(JAVA_HOME_17_X64)
   testSteps: []
 
 jobs:
@@ -20,12 +21,17 @@ jobs:
     steps:
     - template: agent-cleanser/v1.yml@yaml-templates
 
+    - script: |
+        echo "##vso[task.setvariable variable=JAVA_HOME]${{ parameters.jdkTestFolder }}"
+      displayName: set JAVA_HOME to ${{ parameters.jdkTestFolder }}
+
     - template: setup-test-environment.yaml
       parameters:
         installLegacyDotNet: false
         restoreNUnitConsole: false
         updateMono: false
         xaprepareScenario: EmulatorTestDependencies
+        jdkTestFolder: ${{ parameters.jdkTestFolder }}
 
     - task: DownloadPipelineArtifact@2
       inputs:

diff --git a/build-tools/automation/yaml-templates/setup-test-environment.yaml b/build-tools/automation/yaml-templates/setup-test-environment.yaml
@@ -1,7 +1,7 @@
 parameters:
   configuration: $(XA.Build.Configuration)
   xaSourcePath: $(System.DefaultWorkingDirectory)
-  jdkTestFolder: $(JAVA_HOME_11_X64)
+  jdkTestFolder: $(JAVA_HOME_17_X64)
   remove_dotnet: false
   installTestSlicer: false
   installApkDiff: true
@@ -26,13 +26,13 @@ steps:
 - script: |
     echo "##vso[task.setvariable variable=JI_JAVA_HOME]${{ parameters.jdkTestFolder }}"
     echo "##vso[task.setvariable variable=DOTNET_TOOL_PATH]${{ parameters.xaSourcePath }}/bin/${{ parameters.configuration }}/dotnet/dotnet"
-  displayName: set JI_JAVA_HOME
+  displayName: set JI_JAVA_HOME to ${{ parameters.jdkTestFolder }}
   condition: and(succeeded(), ne(variables['agent.os'], 'Windows_NT'))
 
 - script: |
     echo ##vso[task.setvariable variable=JI_JAVA_HOME]${{ parameters.jdkTestFolder }}
     echo ##vso[task.setvariable variable=DOTNET_TOOL_PATH]${{ parameters.xaSourcePath }}\bin\${{ parameters.configuration }}\dotnet\dotnet.exe
-  displayName: set JI_JAVA_HOME
+  displayName: set JI_JAVA_HOME to ${{ parameters.jdkTestFolder }}
   condition: and(succeeded(), eq(variables['agent.os'], 'Windows_NT'))
 
 # Install .NET 6 for legacy tests

diff --git a/build-tools/scripts/TestApks.targets b/build-tools/scripts/TestApks.targets
@@ -371,7 +371,6 @@
     <!-- SDK component installation can be frail, try a few times. -->
     <Exec
         Command="&quot;$(CommandLineToolsBinPath)\sdkmanager&quot; &quot;$(SdkManagerImageName)&quot;"
-        EnvironmentVariables="JAVA_HOME=$(Java8SdkDirectory)"
         ContinueOnError="true">
       <Output TaskParameter="ExitCode" PropertyName="_SdkManagerExitCode" />
     </Exec>
@@ -381,7 +380,6 @@
     />
     <Exec
         Command="&quot;$(CommandLineToolsBinPath)\sdkmanager&quot; &quot;$(SdkManagerImageName)&quot;"
-        EnvironmentVariables="JAVA_HOME=$(Java8SdkDirectory)"
         ContinueOnError="true"
         Condition=" '$(_SdkManagerExitCode)' != '0' ">
       <Output TaskParameter="ExitCode" PropertyName="_SdkManagerExitCode" />
@@ -392,7 +390,6 @@
     />
     <Exec
         Command="&quot;$(CommandLineToolsBinPath)\sdkmanager&quot; &quot;$(SdkManagerImageName)&quot;"
-        EnvironmentVariables="JAVA_HOME=$(Java8SdkDirectory)"
         ContinueOnError="true"
         Condition=" '$(_SdkManagerExitCode)' != '0' ">
       <Output TaskParameter="ExitCode" PropertyName="_SdkManagerExitCode" />

diff --git a/external/xamarin-android-tools b/external/xamarin-android-tools
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs
@@ -1429,9 +1429,6 @@ public void XA4310 ([Values ("apk", "aab")] string packageFormat)
 		[NonParallelizable]
 		public void CheckLintErrorsAndWarnings ()
 		{
-			if (TestEnvironment.IsUsingJdk8)
-				Assert.Ignore ("https://github.com/xamarin/xamarin-android/issues/5698");
-
 			string disabledIssues = "StaticFieldLeak,ObsoleteSdkInt,AllowBackup,ExportedReceiver,RedundantLabel";
 
 			var proj = new XamarinAndroidApplicationProject () {
@@ -1486,9 +1483,6 @@ public class MainActivity : Activity
 		[Test]
 		public void CheckLintConfigMerging ()
 		{
-			if (TestEnvironment.IsUsingJdk8)
-				Assert.Ignore ("https://github.com/xamarin/xamarin-android/issues/5698");
-
 			var proj = new XamarinAndroidApplicationProject ();
 			proj.SetProperty ("AndroidLintEnabled", true.ToString ());
 			proj.OtherBuildItems.Add (new AndroidItem.AndroidLintConfig ("lint1.xml") {
@@ -1622,9 +1616,6 @@ public void DuplicateValuesInResourceCaseMap ()
 		[Test]
 		public void CheckLintResourceFileReferencesAreFixed ()
 		{
-			if (TestEnvironment.IsUsingJdk8)
-				Assert.Ignore ("https://github.com/xamarin/xamarin-android/issues/5698");
-
 			var proj = new XamarinAndroidApplicationProject () {
 				PackageReferences = {
 					KnownPackages.AndroidSupportV4_27_0_2_1,