Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71585a01 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes Ib9ff4eb5,If27a050c 

* changes:
  add *.from-text modules to the java test fixture
  Create a SetBuildFromTextStub method
parents 77e3278c 6bd19dd4

android/config.go

+4 −0
Original line number Diff line number Diff line
@@ -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

}

java/testing.go

+13 −0
Original line number Diff line number Diff line
@@ -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 {