From a1d51127c3d34886b7d833f539e7b5a1855c09fb Mon Sep 17 00:00:00 2001
From: Joseph Shields <directhex@apebox.org>
Date: Mon, 30 Mar 2020 12:47:22 -0400
Subject: [PATCH] Use our new Android builder image

---
 eng/pipelines/common/platform-matrix.yml   | 10 +++++-----
 eng/pipelines/common/xplat-setup.yml       |  3 +--
 eng/pipelines/mono/templates/build-job.yml |  8 --------
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/eng/pipelines/common/platform-matrix.yml b/eng/pipelines/common/platform-matrix.yml
index 26e1a6be088306..516edbced97bf3 100644
--- a/eng/pipelines/common/platform-matrix.yml
+++ b/eng/pipelines/common/platform-matrix.yml
@@ -209,7 +209,7 @@ jobs:
       archType: x64
       platform: Android_x64
       container:
-        image: centos-7-359e48e-20200313130914
+        image: ubuntu-18.04-android-8505948-20200327151156
         registry: mcr
       jobParameters:
         runtimeFlavor: mono
@@ -229,9 +229,9 @@ jobs:
       helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
       osGroup: Android
       archType: arm
-      platform: Android_x64
+      platform: Android_arm
       container:
-        image: centos-7-359e48e-20200313130914
+        image: ubuntu-18.04-android-8505948-20200327151156
         registry: mcr
       jobParameters:
         runtimeFlavor: mono
@@ -251,9 +251,9 @@ jobs:
       helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
       osGroup: Android
       archType: arm64
-      platform: Android_x64
+      platform: Android_arm64
       container:
-        image: centos-7-359e48e-20200313130914
+        image: ubuntu-18.04-android-8505948-20200327151156
         registry: mcr
       jobParameters:
         runtimeFlavor: mono
diff --git a/eng/pipelines/common/xplat-setup.yml b/eng/pipelines/common/xplat-setup.yml
index de7462c67eef63..d11b7c8256c2d6 100644
--- a/eng/pipelines/common/xplat-setup.yml
+++ b/eng/pipelines/common/xplat-setup.yml
@@ -57,8 +57,7 @@ jobs:
 
       - ${{ if eq(parameters.osGroup, 'Android') }}:
         - name: ANDROID_NDK_HOME
-          # default here is value used by Android Studio
-          value: ~/Android/Sdk/ndk
+          value: /usr/local/ndk
 
       - name: runtimeFlavorName
         ${{ if eq(parameters.jobParameters.runtimeFlavor, 'mono') }}:
diff --git a/eng/pipelines/mono/templates/build-job.yml b/eng/pipelines/mono/templates/build-job.yml
index e9ec771dab1fa0..014c6cf4c6d45c 100644
--- a/eng/pipelines/mono/templates/build-job.yml
+++ b/eng/pipelines/mono/templates/build-job.yml
@@ -82,14 +82,6 @@ jobs:
     - ${{ if in(parameters.osGroup, 'OSX', 'iOS') }}:
       - script: sh $(Build.SourcesDirectory)/eng/install-native-dependencies.sh $(osGroup)
         displayName: Install native dependencies
-    - ${{ if in(parameters.osGroup, 'Android') }}:
-      - script: |
-          wget https://dl.google.com/android/repository/android-ndk-r21-linux-x86_64.zip
-          mkdir -p ~/Android/Sdk
-          yum -y install unzip
-          unzip android-ndk-r21-linux-x86_64.zip -d ~/Android/Sdk
-          mv ~/Android/Sdk/*ndk* ~/Android/Sdk/ndk
-        displayName: Install Android NDK
     - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
       # Necessary to install python
       - script: $(Build.SourcesDirectory)\eng\common\init-tools-native.cmd -InstallDirectory $(Build.SourcesDirectory)\native-tools -Force