From d58ee5da445054a60187eb1528e23bddc738cab2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jose=20Alc=C3=A9rreca?= <jalc@google.com>
Date: Mon, 15 Apr 2024 10:30:37 +0000
Subject: [PATCH] Adds flavors and GMD, and fixes snippet

---
 CodeCoverage/app/build.gradle.kts      | 39 +++++++++++++++++++++++++-
 CodeCoverage/gradle/libs.versions.toml |  2 +-
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/CodeCoverage/app/build.gradle.kts b/CodeCoverage/app/build.gradle.kts
index 0efc86d3..22abaad0 100644
--- a/CodeCoverage/app/build.gradle.kts
+++ b/CodeCoverage/app/build.gradle.kts
@@ -52,6 +52,16 @@ android {
             )
         }
     }
+
+    flavorDimensions += "version"
+    productFlavors {
+        create("flavor1") {
+            dimension = "version"
+        }
+        create("flavor2") {
+            dimension = "version"
+        }
+    }
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
@@ -59,6 +69,23 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+
+    testOptions {
+        managedDevices {
+            localDevices {
+                // run with ../gradlew pixel2api30DebugAndroidTest
+                create("pixel2api30") {
+                    // Use device profiles you typically see in Android Studio.
+                    device = "Pixel 2"
+                    // Use only API levels 27 and higher.
+                    apiLevel = 30
+                    // To include Google services, use "google".
+                    systemImageSource = "aosp"
+                }
+            }
+        }
+    }
+
     setupCombinedReportTestCoverage()
 }
 
@@ -115,11 +142,21 @@ fun setupCombinedReportTestCoverage() {
 
                 // TODO: Use a proper API when https://issuetracker.google.com/332830826 is fixed
                 executionData.setFrom(
+                    // Local tests
                     project.fileTree("$buildDir/outputs/unit_test_code_coverage/${variant.name}UnitTest")
                         .matching { include("**/*.exec") },
 
+                    // Instrumented tests
                     project.fileTree("$buildDir/outputs/code_coverage/${variant.name}AndroidTest")
-                        .matching { include("**/*.ec") }
+                        .matching { include("**/*.ec") },
+
+                    // Instrumented tests with GMD
+                    project.fileTree("$buildDir/outputs/managed_device_code_coverage/${variant.name}")
+                        .matching { include("**/*.ec") },
+
+                    // Instrumented tests with GMD and flavors
+                    project.fileTree("$buildDir/outputs/managed_device_code_coverage/${variant.buildType}/flavors/${variant.flavorName}/")
+                        .matching { include("**/*.ec") },
                 )
             }
 
diff --git a/CodeCoverage/gradle/libs.versions.toml b/CodeCoverage/gradle/libs.versions.toml
index ab83fc89..f5a68c66 100644
--- a/CodeCoverage/gradle/libs.versions.toml
+++ b/CodeCoverage/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp = "8.4.0-beta02"
+agp = "8.4.0-rc02"
 kotlin = "1.9.0"
 coreKtx = "1.12.0"
 junit = "4.13.2"