diff --git a/android/config.go b/android/config.go
index 0ef94a5fc..5cd6062f3 100644
--- a/android/config.go
+++ b/android/config.go
@@ -1909,3 +1909,7 @@ func (c *config) ApiSurfacesDir(s ApiSurface, version string) string {
 func (c *config) BuildFromTextStub() bool {
 	return c.buildFromTextStub
 }
+
+func (c *config) SetBuildFromTextStub(b bool) {
+	c.buildFromTextStub = b
+}
diff --git a/java/testing.go b/java/testing.go
index 63d7dba69..8a0db9cb1 100644
--- a/java/testing.go
+++ b/java/testing.go
@@ -368,6 +368,15 @@ func gatherRequiredDepsForTest() string {
 		"core.current.stubs",
 		"legacy.core.platform.api.stubs",
 		"stable.core.platform.api.stubs",
+		"android_stubs_current.from-text",
+		"android_system_stubs_current.from-text",
+		"android_test_stubs_current.from-text",
+		"android_module_lib_stubs_current.from-text",
+		"android_system_server_stubs_current.from-text",
+		"core.current.stubs.from-text",
+		"legacy.core.platform.api.stubs.from-text",
+		"stable.core.platform.api.stubs.from-text",
+
 		"kotlin-stdlib",
 		"kotlin-stdlib-jdk7",
 		"kotlin-stdlib-jdk8",
@@ -409,6 +418,10 @@ func gatherRequiredDepsForTest() string {
 		"core-module-lib-stubs-system-modules",
 		"legacy-core-platform-api-stubs-system-modules",
 		"stable-core-platform-api-stubs-system-modules",
+		"core-public-stubs-system-modules.from-text",
+		"core-module-lib-stubs-system-modules.from-text",
+		"legacy-core-platform-api-stubs-system-modules.from-text",
+		"stable-core-platform-api-stubs-system-modules.from-text",
 	}
 
 	for _, extra := range systemModules {