Merge "Merge cherrypicks of ['android-review.googlesource.com/2818881'] into androidx-compose-beta-release." into androidx-compose-beta-releasesnap-temp-L94000030003264715snap-temp-L82900030003236265snap-temp-L02100030003234405

4 files changed, 17 insertions, 5 deletions

diff --git a/benchmark/baseline-profile-gradle-plugin/build.gradle b/benchmark/baseline-profile-gradle-plugin/build.gradle
index 0fe910fa70a..623ad21efa4 100644
--- a/benchmark/baseline-profile-gradle-plugin/build.gradle
+++ b/benchmark/baseline-profile-gradle-plugin/build.gradle
@@ -29,6 +29,12 @@ configurations {
     neededForGradleTestKit {
         canBeResolved = true
     }
+    neededForGradleTestKitAgp80 {
+        canBeResolved = true
+    }
+    neededForGradleTestKitAgp81 {
+        canBeResolved = true
+    }
 }
 
 dependencies {
@@ -48,6 +54,9 @@ dependencies {
     neededForGradleTestKit(libs.androidGradlePluginz)
     neededForGradleTestKit(libs.kotlinGradlePluginz)
     neededForGradleTestKit(libs.kotlinStdlib)
+
+    neededForGradleTestKitAgp80("com.android.tools.build:gradle:8.0.0")
+    neededForGradleTestKitAgp81("com.android.tools.build:gradle:8.1.0")
 }
 
 SdkResourceGenerator.generateForHostTest(project)
diff --git a/benchmark/baseline-profile-gradle-plugin/src/test/kotlin/androidx/baselineprofile/gradle/consumer/BaselineProfileConsumerPluginTest.kt b/benchmark/baseline-profile-gradle-plugin/src/test/kotlin/androidx/baselineprofile/gradle/consumer/BaselineProfileConsumerPluginTest.kt
index 987a388d347..b264081c78b 100644
--- a/benchmark/baseline-profile-gradle-plugin/src/test/kotlin/androidx/baselineprofile/gradle/consumer/BaselineProfileConsumerPluginTest.kt
+++ b/benchmark/baseline-profile-gradle-plugin/src/test/kotlin/androidx/baselineprofile/gradle/consumer/BaselineProfileConsumerPluginTest.kt
@@ -24,7 +24,6 @@ import androidx.baselineprofile.gradle.utils.Fixtures
 import androidx.baselineprofile.gradle.utils.TestAgpVersion
 import androidx.baselineprofile.gradle.utils.TestAgpVersion.TEST_AGP_VERSION_8_0_0
 import androidx.baselineprofile.gradle.utils.TestAgpVersion.TEST_AGP_VERSION_8_1_0
-import androidx.baselineprofile.gradle.utils.TestAgpVersion.TEST_AGP_VERSION_8_2_0
 import androidx.baselineprofile.gradle.utils.TestAgpVersion.TEST_AGP_VERSION_CURRENT
 import androidx.baselineprofile.gradle.utils.VariantProfile
 import androidx.baselineprofile.gradle.utils.build
@@ -71,8 +70,9 @@ class BaselineProfileConsumerPluginTest(private val agpVersion: TestAgpVersion)
     private fun mergedArtProfile(variantName: String): File {
         // Task name folder in path was first observed in the update to AGP 8.3.0-alpha10.
         // Before that, the folder was omitted in path.
+        // TODO: Add back TEST_AGP_VERSION_8_2_0 after b/309493780
         val taskNameFolder = when (agpVersion) {
-            TEST_AGP_VERSION_8_0_0, TEST_AGP_VERSION_8_1_0, TEST_AGP_VERSION_8_2_0 -> ""
+            TEST_AGP_VERSION_8_0_0, TEST_AGP_VERSION_8_1_0 -> ""
             TEST_AGP_VERSION_CURRENT -> camelCase("merge", variantName, "artProfile")
         }
         return File(
diff --git a/benchmark/baseline-profile-gradle-plugin/src/test/kotlin/androidx/baselineprofile/gradle/producer/BaselineProfileProducerPluginTest.kt b/benchmark/baseline-profile-gradle-plugin/src/test/kotlin/androidx/baselineprofile/gradle/producer/BaselineProfileProducerPluginTest.kt
index 7a47707f96c..8e8213c2ef5 100644
--- a/benchmark/baseline-profile-gradle-plugin/src/test/kotlin/androidx/baselineprofile/gradle/producer/BaselineProfileProducerPluginTest.kt
+++ b/benchmark/baseline-profile-gradle-plugin/src/test/kotlin/androidx/baselineprofile/gradle/producer/BaselineProfileProducerPluginTest.kt
@@ -20,13 +20,13 @@ import androidx.baselineprofile.gradle.utils.BaselineProfileProjectSetupRule
 import androidx.baselineprofile.gradle.utils.TestAgpVersion
 import androidx.baselineprofile.gradle.utils.TestAgpVersion.TEST_AGP_VERSION_8_0_0
 import androidx.baselineprofile.gradle.utils.TestAgpVersion.TEST_AGP_VERSION_8_1_0
-import androidx.baselineprofile.gradle.utils.TestAgpVersion.TEST_AGP_VERSION_8_2_0
 import androidx.baselineprofile.gradle.utils.VariantProfile
 import androidx.baselineprofile.gradle.utils.build
 import androidx.baselineprofile.gradle.utils.buildAndAssertThatOutput
 import androidx.baselineprofile.gradle.utils.buildAndFailAndAssertThatOutput
 import androidx.baselineprofile.gradle.utils.require
 import com.google.common.truth.Truth.assertThat
+import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -103,7 +103,8 @@ class BaselineProfileProducerPluginTestWithAgp82 {
 
     @get:Rule
     val projectSetup = BaselineProfileProjectSetupRule(
-        forceAgpVersion = TEST_AGP_VERSION_8_2_0.versionString
+        // TODO: Update after b/309493780
+        forceAgpVersion = null
     )
 
     private val emptyReleaseVariantProfile = VariantProfile(
@@ -112,6 +113,7 @@ class BaselineProfileProducerPluginTestWithAgp82 {
         profileFileLines = mapOf()
     )
 
+    @Ignore("b/309493780")
     @Test
     fun verifyInstrumentationRunnerArgumentsAreSet() {
         projectSetup.appTarget.setup()
@@ -151,6 +153,7 @@ class BaselineProfileProducerPluginTestWithAgp82 {
             }
     }
 
+    @Ignore("b/309493780")
     @Test
     fun runWhenInstrumentationRunnerArgumentsAreSetManually() {
         projectSetup.appTarget.setup()
diff --git a/benchmark/baseline-profile-gradle-plugin/src/test/kotlin/androidx/baselineprofile/gradle/utils/Constants.kt b/benchmark/baseline-profile-gradle-plugin/src/test/kotlin/androidx/baselineprofile/gradle/utils/Constants.kt
index 93f94b98921..063bcd6b9b6 100644
--- a/benchmark/baseline-profile-gradle-plugin/src/test/kotlin/androidx/baselineprofile/gradle/utils/Constants.kt
+++ b/benchmark/baseline-profile-gradle-plugin/src/test/kotlin/androidx/baselineprofile/gradle/utils/Constants.kt
@@ -19,6 +19,6 @@ package androidx.baselineprofile.gradle.utils
 enum class TestAgpVersion(val versionString: String?) {
     TEST_AGP_VERSION_8_0_0("8.0.0"),
     TEST_AGP_VERSION_8_1_0("8.1.0"),
-    TEST_AGP_VERSION_8_2_0("8.2.0-alpha04"),
+    // TODO: add back `TEST_AGP_VERSION_8_2_0("8.2.0")` after b/309493780,
     TEST_AGP_VERSION_CURRENT(null)
 }