From cebeffa210b5cbdf95823ce00ecbc43bbf6f13f2 Mon Sep 17 00:00:00 2001
From: Parker Bibus <parkerbibus@microsoft.com>
Date: Mon, 11 Dec 2023 15:24:22 -0800
Subject: [PATCH] Add performance android build specific platform-matrix entry
 with specific image to fix android app build/run issues.

---
 eng/pipelines/common/platform-matrix.yml     | 23 ++++++++++++++++++++
 eng/pipelines/coreclr/perf-non-wasm-jobs.yml |  4 ++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/eng/pipelines/common/platform-matrix.yml b/eng/pipelines/common/platform-matrix.yml
index 2ec41d7682c7e2..0c0969520b0dc8 100644
--- a/eng/pipelines/common/platform-matrix.yml
+++ b/eng/pipelines/common/platform-matrix.yml
@@ -580,6 +580,29 @@ jobs:
         helixQueueGroup: ${{ parameters.helixQueueGroup }}
         ${{ insert }}: ${{ parameters.jobParameters }}
 
+- ${{ if containsValue(parameters.platforms, 'Android_arm64_perf_specific') }}:
+  - template: xplat-setup.yml
+    parameters:
+      jobTemplate: ${{ parameters.jobTemplate }}
+      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
+      variables: ${{ parameters.variables }}
+      osGroup: Android
+      archType: arm64
+      targetRid: android-arm64
+      platform: Android_arm64
+      shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
+      container:
+        image: cbl-mariner-2.0-cross-android-amd64
+        registry: mcr
+      jobParameters:
+        runtimeFlavor: mono
+        stagedBuild: ${{ parameters.stagedBuild }}
+        buildConfig: ${{ parameters.buildConfig }}
+        ${{ if eq(parameters.passPlatforms, true) }}:
+          platforms: ${{ parameters.platforms }}
+        helixQueueGroup: ${{ parameters.helixQueueGroup }}
+        ${{ insert }}: ${{ parameters.jobParameters }}
+
 # Mac Catalyst x64
 
 - ${{ if containsValue(parameters.platforms, 'MacCatalyst_x64') }}:
diff --git a/eng/pipelines/coreclr/perf-non-wasm-jobs.yml b/eng/pipelines/coreclr/perf-non-wasm-jobs.yml
index 9a60000c79d08a..cbb49599d95684 100644
--- a/eng/pipelines/coreclr/perf-non-wasm-jobs.yml
+++ b/eng/pipelines/coreclr/perf-non-wasm-jobs.yml
@@ -65,7 +65,7 @@ jobs:
       buildConfig: release
       runtimeFlavor: mono
       platforms:
-      - Android_arm64
+      - Android_arm64_perf_specific
       jobParameters:
         buildArgs: -s mono+libs+host+packs -c $(_BuildConfig)
         nameSuffix: AndroidMono
@@ -314,4 +314,4 @@ jobs:
         projectFile: crossgen_perf.proj
         runKind: crossgen_scenarios
         runJobTemplate: /eng/pipelines/coreclr/templates/run-scenarios-job.yml
-        logicalmachine: 'perftiger_crossgen'
\ No newline at end of file
+        logicalmachine: 'perftiger_crossgen'