Merge bede1ca41c into 7d45eae4f8

app/build.gradle.kts

@@ -150,3 +150,13 @@ baselineProfile {
 dependencyGuard {
     configuration("prodReleaseRuntimeClasspath")
 }
+
+val benchmarksProject = rootProject.findProject(":benchmarks")
+if (benchmarksProject != null) {
+    tasks.matching { it.name == "createProdNonMinifiedReleaseApkListingFileRedirect" }
+        .configureEach {
+            dependsOn(benchmarksProject.tasks.matching {
+                it.name.contains("packageProdNonMinifiedRelease")
+            })
+        }
+}

benchmarks/build.gradle.kts

@@ -26,7 +26,7 @@ android {
     defaultConfig {
         minSdk = 28
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-
+        testInstrumentationRunnerArguments["androidx.benchmark.enabledRules"] = "BaselineProfile"
         buildConfigField("String", "APP_BUILD_TYPE_SUFFIX", "\"\"")
     }