StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes Ib9ff4eb5,If27a050c

Browse Source 
* changes:
  add *.from-text modules to the java test fixture
  Create a SetBuildFromTextStub method
This commit is contained in:
Treehugger Robot
2023-04-03 16:44:08 +00:00
committed by Gerrit Code Review
parent 77e3278c50 6bd19dd4c5
commit 71585a0187
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/config.go
View File

@@ -1894,3 +1894,7 @@ func (c *config) ApiSurfacesDir(s ApiSurface, version string) string {
func (c *config) BuildFromTextStub() bool { func (c *config) BuildFromTextStub() bool {
return c.buildFromTextStub return c.buildFromTextStub
} }
func (c *config) SetBuildFromTextStub(b bool) {
c.buildFromTextStub = b
}

13
java/testing.go
View File

@@ -368,6 +368,15 @@ func gatherRequiredDepsForTest() string {
"core.current.stubs", "core.current.stubs",
"legacy.core.platform.api.stubs", "legacy.core.platform.api.stubs",
"stable.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",
"kotlin-stdlib-jdk7", "kotlin-stdlib-jdk7",
"kotlin-stdlib-jdk8", "kotlin-stdlib-jdk8",
@@ -409,6 +418,10 @@ func gatherRequiredDepsForTest() string {
"core-module-lib-stubs-system-modules", "core-module-lib-stubs-system-modules",
"legacy-core-platform-api-stubs-system-modules", "legacy-core-platform-api-stubs-system-modules",
"stable-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 { for _, extra := range systemModules {