Merge dotnet/java-interop into external/Java.Interop with full history

.gitmodules

@@ -10,10 +10,6 @@
     path = external/debugger-libs
     url = https://github.com/mono/debugger-libs
     branch = main
-[submodule "external/Java.Interop"]
-    path = external/Java.Interop
-    url = https://github.com/dotnet/java-interop
-    branch = main
 [submodule "external/libunwind"]
     path = external/libunwind
     url = https://github.com/libunwind/libunwind.git
@@ -37,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,19 @@ stages:
       parameters:
         condition: true
 
+# Java.Interop Tests Stage
+- template: /build-tools/automation/yaml-templates/stage-java-interop-tests.yaml@self
+  parameters:
+    windowsPool:
+      name: $(NetCorePublicPoolName)
+      demands:
+      - ImageOverride -equals $(WindowsPoolImageNetCorePublic)
+    macPool:
+      name: AcesShared
+      demands:
+      - ImageOverride -equals ACES_VM_SharedPool_Tahoe
+      os: macOS
+
 # 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,100 @@
+# 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()
+- name: windowsPool
+  type: object
+  default:
+    name: Azure Pipelines
+    vmImage: $(HostedWinImage)
+- name: macPool
+  type: object
+  default:
+    name: Azure Pipelines
+    vmImage: $(HostedMacImage)
+
+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: ${{ parameters.windowsPool }}
+    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
+
+  # Check - "Xamarin.Android (Java.Interop Tests Mac - .NET)"
+  - job: java_interop_mac_dotnet_build
+    displayName: Mac - .NET
+    pool: ${{ parameters.macPool }}
+    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>

external/Java.Interop/.devcontainer/devcontainer.json

@@ -0,0 +1,34 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/dotnet
+{
+	"name": "Linux Universal Image",
+	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+	"image": "mcr.microsoft.com/devcontainers/universal:2-linux"
+
+    // Features to add to the dev container. More info: https://containers.dev/features.
+	, "features": {
+		"ghcr.io/devcontainers/features/java:1": {
+			"version": "17",
+			"jdkDistro": "ms"
+		}
+	}
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [5000, 5001],
+	// "portsAttributes": {
+	//		"5001": {
+	//			"protocol": "https"
+	//		}
+	// }
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	// Have GitHub Codespaces checkout all submodules
+	// https://github.com/orgs/community/discussions/25429
+	, "postCreateCommand": "git submodule update --init --recursive"
+
+	// Configure tool-specific properties.
+	// "customizations": {},
+
+	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+	// "remoteUser": "root"
+}