Merge :integration_tests:agp:testsupport into :integration_tests:agp

AGP is now able to merge test manifests,
so it is no longer needed to have two modules.

integration_tests/agp/build.gradle.kts

@@ -24,7 +24,6 @@ dependencies {
   // Testing dependencies
   testImplementation(project(":testapp"))
   testImplementation(project(":robolectric"))
-  testImplementation(project(":integration_tests:agp:testsupport"))
 
   testImplementation(libs.junit4)
   testImplementation(libs.androidx.test.core)

integration_tests/agp/src/main/AndroidManifest.xml

@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest>
-  <application />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+  <application>
+    <activity android:name="TestActivity"/>
+  </application>
 </manifest>

integration_tests/agp/testsupport/src/main/java/org/robolectric/integrationtests/agp/testsupport/TestActivity.java → integration_tests/agp/src/main/java/org/robolectric/integrationtests/agp/TestActivity.java

@@ -1,4 +1,4 @@
-package org.robolectric.integrationtests.agp.testsupport;
+package org.robolectric.integrationtests.agp;
 
 import android.app.Activity;
 

integration_tests/agp/src/test/java/org/robolectric/integrationtests/agp/TestActivityTest.java

@@ -4,20 +4,12 @@
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.integrationtests.agp.testsupport.TestActivity;
 
-/**
- * Test asserting that test-only activities can be declared in a dependency project's manifest as a
- * workaround for the fact that Android Gradle Plugin doesn't merge the test manifest (as of 3.4).
- *
- * <p>When http://issuetracker.google.com/issues/127986458 is fixed, we can collapse {@code
- * :integration_tests:agp:testsupport} back into {@code :integration_tests:agp}.
- */
 @RunWith(AndroidJUnit4.class)
 public class TestActivityTest {
 
   @Test
-  public void testActivitiesCanBeDeclaredInADependencyLibrary() throws Exception {
+  public void testActivitiesCanBeDeclaredInADependencyLibrary() {
     ActivityScenario.launch(TestActivity.class);
   }
 }

settings.gradle.kts

@@ -21,7 +21,6 @@ include(
   ":annotations",
   ":errorprone",
   ":integration_tests:agp",
-  ":integration_tests:agp:testsupport",
   ":integration_tests:androidx",
   ":integration_tests:androidx_test",
   ":integration_tests:ctesque",