Add Java.Interop CI stage and merge follow-ups

Adds a shared 'Java.Interop Tests' stage template at
build-tools/automation/yaml-templates/stage-java-interop-tests.yaml
that runs the two jobs from the upstream java-interop pipeline
(Windows - .NET, Mac - .NET) using the in-tree
external/Java.Interop/build-tools/automation/templates/ files.

The stage is wired into both the official pipeline (azure-pipelines.yaml)
and the public PR validation pipeline (azure-pipelines-public.yaml) so
they stay in lockstep with zero duplication.

A follow-up PR will reorganize external/Java.Interop and dedupe its
nested external/* submodules against dotnet/android's own external/.

Author: jonathanpeppers

.gitmodules

@@ -33,3 +33,7 @@
 [submodule "external/termux-elf-cleaner"]
 	path = external/termux-elf-cleaner
 	url = https://github.com/termux/termux-elf-cleaner
+[submodule "external/Java.Interop/external/xamarin-android-tools"]
+	path = external/Java.Interop/external/xamarin-android-tools
+	url = https://github.com/xamarin/xamarin-android-tools.git
+	branch = main

build-tools/automation/azure-pipelines-public.yaml

@@ -412,6 +412,9 @@ stages:
       parameters:
         condition: true
 
+# Java.Interop Tests Stage
+- template: /build-tools/automation/yaml-templates/stage-java-interop-tests.yaml@self
+
 # MAUI Tests Stage
 - stage: maui_tests
   displayName: MAUI Tests

build-tools/automation/azure-pipelines.yaml

@@ -99,6 +99,8 @@ extends:
       parameters:
         usesCleanImages: ${{ parameters.macTestAgentsUseCleanImages }}
 
+    - template: /build-tools/automation/yaml-templates/stage-java-interop-tests.yaml@self
+
     - stage: maui_tests
       displayName: MAUI Tests
       dependsOn: mac_build

build-tools/automation/yaml-templates/cache-gradle.yaml

@@ -9,14 +9,14 @@ parameters:
 
 steps:
 - script: |
-    git submodule status --cached external/Java.Interop > $(Agent.TempDirectory)/java-interop-submodule-hash.txt
+    git log -1 --format=%H external/Java.Interop > $(Agent.TempDirectory)/java-interop-submodule-hash.txt
     echo "##vso[task.setvariable variable=GRADLE_CACHE_DIR]$HOME/.gradle/caches"
   workingDirectory: ${{ parameters.xaSourcePath }}
   displayName: prepare Gradle cache variables
   condition: ne(variables['Agent.OS'], 'Windows_NT')
 
 - pwsh: |
-    git submodule status --cached external/Java.Interop > $(Agent.TempDirectory)/java-interop-submodule-hash.txt
+    git log -1 --format=%H external/Java.Interop > $(Agent.TempDirectory)/java-interop-submodule-hash.txt
     $gradleCacheDir = Join-Path $env:USERPROFILE ".gradle\caches"
     Write-Host "##vso[task.setvariable variable=GRADLE_CACHE_DIR]$gradleCacheDir"
   workingDirectory: ${{ parameters.xaSourcePath }}

build-tools/automation/yaml-templates/stage-java-interop-tests.yaml

@@ -0,0 +1,101 @@
+# Java.Interop tests stage
+#
+# Mirrors the two jobs from
+# external/Java.Interop/build-tools/automation/azure-pipelines.yaml
+# (windows_dotnet_build, mac_dotnet_build) so that the Java.Interop
+# build + tests continue to run as part of dotnet/android CI now that
+# Java.Interop has been merged in-tree.
+#
+# Referenced from both:
+#   - build-tools/automation/azure-pipelines.yaml         (official / 1ES)
+#   - build-tools/automation/azure-pipelines-public.yaml  (public PR validation)
+
+parameters:
+- name: stageName
+  type: string
+  default: java_interop_tests
+- name: dependsOn
+  type: object
+  default: []
+- name: condition
+  type: string
+  default: succeeded()
+
+stages:
+- stage: ${{ parameters.stageName }}
+  displayName: Java.Interop Tests
+  dependsOn: ${{ parameters.dependsOn }}
+  condition: ${{ parameters.condition }}
+  variables:
+    # Variables consumed by external/Java.Interop/build-tools/automation/templates/*.yaml.
+    # Defined at stage scope so they don't conflict with dotnet/android-wide
+    # variables (e.g. DotNetTargetFramework=net11.0).
+    DotNetCoreVersion: $(DotNetSdkVersion).x
+    DotNetTargetFramework: $(DotNetStableTargetFramework)
+    NetCoreTargetFrameworkPathSuffix: -$(DotNetStableTargetFramework)
+    Build.Configuration: Release
+    RunningOnCI: true
+  jobs:
+
+  # Check - "Xamarin.Android (Java.Interop Tests Windows - .NET)"
+  - job: java_interop_windows_dotnet_build
+    displayName: Windows - .NET
+    pool:
+      name: Azure Pipelines
+      vmImage: $(HostedWinImage)
+    timeoutInMinutes: 60
+    workspace:
+      clean: all
+    steps:
+    - checkout: self
+      submodules: recursive
+      clean: true
+
+    - template: /external/Java.Interop/build-tools/automation/templates/install-dependencies.yaml@self
+
+    - template: /external/Java.Interop/build-tools/automation/templates/core-build.yaml@self
+
+    - template: /external/Java.Interop/build-tools/automation/templates/core-tests.yaml@self
+      parameters:
+        runNativeDotnetTests: true
+        nativeAotRid: win-x64
+        platformName: .NET - Windows
+
+    - template: /external/Java.Interop/build-tools/automation/templates/fail-on-dirty-tree.yaml@self
+
+    - template: /external/Java.Interop/build-tools/automation/templates/fail-on-issue.yaml@self
+
+    - task: PublishPipelineArtifact@1
+      displayName: Publish build artifacts
+      inputs:
+        artifactName: java-interop-windows
+        targetPath: external/Java.Interop/bin
+      condition: succeededOrFailed()
+
+  # Check - "Xamarin.Android (Java.Interop Tests Mac - .NET)"
+  - job: java_interop_mac_dotnet_build
+    displayName: Mac - .NET
+    pool:
+      name: Azure Pipelines
+      vmImage: $(HostedMacImage)
+    timeoutInMinutes: 20
+    workspace:
+      clean: all
+    steps:
+    - checkout: self
+      submodules: recursive
+      clean: true
+
+    - template: /external/Java.Interop/build-tools/automation/templates/install-dependencies.yaml@self
+
+    - template: /external/Java.Interop/build-tools/automation/templates/core-build.yaml@self
+
+    - template: /external/Java.Interop/build-tools/automation/templates/core-tests.yaml@self
+      parameters:
+        runNativeTests: true
+        nativeAotRid: osx-x64
+        platformName: .NET - MacOS
+
+    - template: /external/Java.Interop/build-tools/automation/templates/fail-on-dirty-tree.yaml@self
+
+    - template: /external/Java.Interop/build-tools/automation/templates/fail-on-issue.yaml@self

build-tools/scripts/XAVersionInfo.targets

@@ -16,9 +16,8 @@
       <!-- If anything changes in this list, make sure to update:
            src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets (the _GenerateXACommonProps target)
       -->
-      <_SubmoduleBranchInfo Include="external/Java.Interop">
-        <OutputPropertyName>_BuildInfo_JavaInteropCommit</OutputPropertyName>
-      </_SubmoduleBranchInfo>
+      <!-- Java.Interop is no longer a submodule; it lives in-tree under
+           external/Java.Interop/. Its commit is the dotnet/android commit. -->
       <_SubmoduleBranchInfo Include="external/xamarin-android-tools">
         <OutputPropertyName>_BuildInfo_XamarinAndroidToolsCommit</OutputPropertyName>
       </_SubmoduleBranchInfo>