From 22bbdf03e02ee685d985279aad04fd6e16c9e7be Mon Sep 17 00:00:00 2001
From: Ricardo Amador <32242716+ricardoamador@users.noreply.github.com>
Date: Thu, 2 Feb 2023 12:56:05 -0800
Subject: [PATCH] Android defines target update (#119766)

* Round 2 with dimensions

* Try with stringified keys

* Forgot a comma

* trying a list of maps.

* Try key value pairs

* Try with kvm only

* try with swarming_dimensions

* Updated with fix in swarming.star

* Attempting to remove the bring up property to verify test is running.

* Remove android from target tags to avoid adb command automatically running in test_utils call.

* Remove the duplicated dependencies in the defines target that exist in the platform
---
 .ci.yaml | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/.ci.yaml b/.ci.yaml
index ac9d2f38e65..a6d6a990c29 100644
--- a/.ci.yaml
+++ b/.ci.yaml
@@ -1376,16 +1376,25 @@ targets:
         ["devicelab", "android", "linux"]
       task_name: analyzer_benchmark
 
-  # TODO (ricardoamador) https://github.com/flutter/flutter/issues/119026
   - name: Linux_android android_defines_test
     recipe: devicelab/devicelab_drone
-    bringup: true
-    presubmit: false
+    presubmit: true
     timeout: 60
+    dimensions: {
+      kvm: "1",
+      cores: "8",
+      machine_type: "n1-standard-8"
+    }
     properties:
+      device_type: "none"
       tags: >
-        ["devicelab" ,"android", "linux"]
+        ["devicelab", "linux"]
       task_name: android_defines_test
+      dependencies: >-
+        [
+          {"dependency": "android_virtual_device", "version": "31"}
+        ]
+      use_emulator: "true"
 
   - name: Linux_android android_obfuscate_test
     recipe: devicelab/devicelab_drone