diff options
| author | 2023-04-03 16:44:08 +0000 | |
|---|---|---|
| committer | 2023-04-03 16:44:08 +0000 | |
| commit | 71585a0187006ae6eef4a5571b3f4a98c56ef0af (patch) | |
| tree | 2f030bf5f9930842411f8226b28240ac8528bb4d | |
| parent | 77e3278c50efce9ca2faf94883954864ebdee73c (diff) | |
| parent | 6bd19dd4c5d69f8bb2e53728dfc5283812aa27bb (diff) | |
Merge changes Ib9ff4eb5,If27a050c
* changes:
add *.from-text modules to the java test fixture
Create a SetBuildFromTextStub method
| -rw-r--r-- | android/config.go | 4 | ||||
| -rw-r--r-- | java/testing.go | 13 |
2 files changed, 17 insertions, 0 deletions
diff --git a/android/config.go b/android/config.go index 33deba500..038cd0f19 100644 --- a/android/config.go +++ b/android/config.go @@ -1894,3 +1894,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 { |