Update azure-pipelines.yml

azure-pipelines.yml

@@ -169,12 +169,14 @@ stages:
             cakeExtraArgs: --avd-target="`"system-images;android-21;google_apis;x86`""
             cake: $(CAKE_VERSION)
             preBuildSteps:
-              - bash: sh -c "echo \"y\" | $ANDROID_HOME/tools/bin/sdkmanager \"system-images;android-21;google_apis;x86\""
-                displayName: Install the Android emulators
-              # Setup JDK Paths (needs to happen after setting up emulators!)
+              # Setup JDK Paths
               - bash: |
                   echo "##vso[task.setvariable variable=JAVA_HOME]$(JAVA_HOME_11_X64)"
                 displayName: 'Setup JDK Paths'
+              - bash: |
+                  cd $ANDROID_HOME/tools/bin/
+                  sh -c "echo \"y\" | sdkmanager "system-images;android-21;google_apis;x86"
+                displayName: Install the Android emulators
   
         - template: .ci/build.v1.yml@components
           parameters:
@@ -190,12 +192,12 @@ stages:
             cakeExtraArgs: --avd-target="`"system-images;android-22;google_apis;x86`""
             cake: $(CAKE_VERSION)
             preBuildSteps:
-              - bash: sh -c "echo \"y\" | $ANDROID_HOME/tools/bin/sdkmanager \"system-images;android-22;google_apis;x86\""
-                displayName: Install the Android emulators
-              # Setup JDK Paths (needs to happen after setting up emulators!)
+              # Setup JDK Paths
               - bash: |
                   echo "##vso[task.setvariable variable=JAVA_HOME]$(JAVA_HOME_11_X64)"
                 displayName: 'Setup JDK Paths'
+              - bash: sh -c "echo \"y\" | $ANDROID_HOME/tools/bin/sdkmanager \"system-images;android-22;google_apis;x86\""
+                displayName: Install the Android emulators
   
 #         - template: .ci/build.v1.yml@components
 #           parameters:
@@ -212,12 +214,12 @@ stages:
 #             cakeExtraArgs: --avd-target="`"system-images;android-23;google_apis;x86`""
 #             cake: $(CAKE_VERSION)
 #             preBuildSteps:
+#                # Setup JDK Paths
+#                - bash: |
+#                   echo "##vso[task.setvariable variable=JAVA_HOME]$(JAVA_HOME_11_X64)"
+#                 displayName: 'Setup JDK Paths'
 #               - bash: sh -c "echo \"y\" | $ANDROID_HOME/tools/bin/sdkmanager \"system-images;android-23;google_apis;x86\""
 #                 displayName: Install the Android emulators
-#               # Setup JDK Paths (needs to happen after setting up emulators!)
-#               - bash: |
-#                 echo "##vso[task.setvariable variable=JAVA_HOME]$(JAVA_HOME_11_X64)"
-#               displayName: 'Setup JDK Paths'
   
         - template: .ci/build.v1.yml@components
           parameters:
@@ -233,12 +235,12 @@ stages:
             cakeExtraArgs: --avd-target="`"system-images;android-24;google_apis;x86`""
             cake: $(CAKE_VERSION)
             preBuildSteps:
-              - bash: sh -c "echo \"y\" | $ANDROID_HOME/tools/bin/sdkmanager \"system-images;android-24;google_apis;x86\""
-                displayName: Install the Android emulators
-              # Setup JDK Paths (needs to happen after setting up emulators!)
+              # Setup JDK Paths
               - bash: |
                   echo "##vso[task.setvariable variable=JAVA_HOME]$(JAVA_HOME_11_X64)"
                 displayName: 'Setup JDK Paths'
+              - bash: sh -c "echo \"y\" | $ANDROID_HOME/tools/bin/sdkmanager \"system-images;android-24;google_apis;x86\""
+                displayName: Install the Android emulators
   
         - template: .ci/build.v1.yml@components
           parameters:
@@ -254,12 +256,12 @@ stages:
             cakeExtraArgs: --avd-target="`"system-images;android-26;google_apis;x86`""
             cake: $(CAKE_VERSION)
             preBuildSteps:
-              - bash: sh -c "echo \"y\" | $ANDROID_HOME/tools/bin/sdkmanager \"system-images;android-26;google_apis;x86\""
-                displayName: Install the Android emulators
-              # Setup JDK Paths (needs to happen after setting up emulators!)
+              # Setup JDK Paths
               - bash: |
                   echo "##vso[task.setvariable variable=JAVA_HOME]$(JAVA_HOME_11_X64)"
                 displayName: 'Setup JDK Paths'
+              - bash: sh -c "echo \"y\" | $ANDROID_HOME/tools/bin/sdkmanager \"system-images;android-26;google_apis;x86\""
+                displayName: Install the Android emulators
   
         - template: .ci/build.v1.yml@components
           parameters:
@@ -275,12 +277,12 @@ stages:
             cakeExtraArgs: --avd-target="`"system-images;android-29;google_apis;x86`""
             cake: $(CAKE_VERSION)
             preBuildSteps:
-              - bash: sh -c "echo \"y\" | $ANDROID_HOME/tools/bin/sdkmanager \"system-images;android-29;google_apis;x86\""
-                displayName: Install the Android emulators
-              # Setup JDK Paths (needs to happen after setting up emulators!)
+              # Setup JDK Paths
               - bash: |
                   echo "##vso[task.setvariable variable=JAVA_HOME]$(JAVA_HOME_11_X64)"
                 displayName: 'Setup JDK Paths'
+              - bash: sh -c "echo \"y\" | $ANDROID_HOME/tools/bin/sdkmanager \"system-images;android-29;google_apis;x86\""
+                displayName: Install the Android emulators
   
         # - template: .ci/build.v1.yml@components
         #   parameters:
@@ -296,9 +298,9 @@ stages:
         #     cakeExtraArgs: --avd-target="`"system-images;android-30;google_apis;x86`""
         #     cake: $(CAKE_VERSION)
         #     preBuildSteps:
+        #       # Setup JDK Paths
+        #       - bash: |
+        #          echo "##vso[task.setvariable variable=JAVA_HOME]$(JAVA_HOME_11_X64)"
+        #         displayName: 'Setup JDK Paths'
         #       - bash: sh -c "echo \"y\" | $ANDROID_HOME/tools/bin/sdkmanager \"system-images;android-30;google_apis;x86\""
         #         displayName: Install the Android emulators
-        #       # Setup JDK Paths (needs to happen after setting up emulators!)
-        #       - bash: |
-        #         echo "##vso[task.setvariable variable=JAVA_HOME]$(JAVA_HOME_11_X64)"
-        #       displayName: 'Setup JDK Paths'