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

Commit 1975d3e3 authored by Jihoon Kang's avatar Jihoon Kang
Browse files

Disable from-text stub build for coverage build 

Coverage builds depend on `native` properties for API elements, which
are not included in the API signature files and consequently in
from-text stubs. As no robust solution for handling this has been
planned out at the moment, from-text stub build is disabled for
coverage builds.

Per go/android-code-coverage-quickstart , Java code coverage is
enabled by the three environment variables: `EMMA_INSTRUMENT`,
`EMMA_INSTRUMENT_STAIC` and `EMMA_INSTRUMENT_FRAMEWORK`. This change
disables from-text stub build if any of the three variables are set
to true.

Test: go test ./java && m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true nothing --build-from-text-stub and inspect ninja query to verify that the stub java library module depends on the from-source stub module
Bug: 304271961
Change-Id: Ie485c784145de6c253611e698354c4f9e4a30685
parent ab3ed731

android/config.go

+8 −1
Original line number Diff line number Diff line
@@ -2059,8 +2059,15 @@ func (c *config) ApiSurfacesDir(s ApiSurface, version string) string { 
		version)

}



func (c *config) JavaCoverageEnabled() bool {

	return c.IsEnvTrue("EMMA_INSTRUMENT") || c.IsEnvTrue("EMMA_INSTRUMENT_STATIC") || c.IsEnvTrue("EMMA_INSTRUMENT_FRAMEWORK")

}



func (c *config) BuildFromTextStub() bool {

	return c.buildFromTextStub

	// TODO: b/302320354 - Remove the coverage build specific logic once the

	// robust solution for handling native properties in from-text stub build

	// is implemented.

	return c.buildFromTextStub && !c.JavaCoverageEnabled()

}



func (c *config) SetBuildFromTextStub(b bool) {

java/java_test.go

+30 −0
Original line number Diff line number Diff line
@@ -2599,3 +2599,33 @@ func TestApiLibraryDroidstubsDependency(t *testing.T) { 
		currentApiTimestampPath,

	)

}



func TestDisableFromTextStubForCoverageBuild(t *testing.T) {

	result := android.GroupFixturePreparers(

		prepareForJavaTest,

		PrepareForTestWithJavaSdkLibraryFiles,

		PrepareForTestWithJacocoInstrumentation,

		FixtureWithLastReleaseApis("foo"),

		android.FixtureModifyConfig(func(config android.Config) {

			config.SetApiLibraries([]string{"foo"})

			config.SetBuildFromTextStub(true)

		}),

		android.FixtureModifyEnv(func(env map[string]string) {

			env["EMMA_INSTRUMENT"] = "true"

		}),

	).RunTestWithBp(t, `

		java_sdk_library {

			name: "foo",

			srcs: ["A.java"],

		}

	`)

	android.AssertBoolEquals(t, "stub module expected to depend on from-source stub",

		true, CheckModuleHasDependency(t, result.TestContext,

			apiScopePublic.stubsLibraryModuleName("foo"), "android_common",

			apiScopePublic.sourceStubLibraryModuleName("foo")))



	android.AssertBoolEquals(t, "stub module expected to not depend on from-text stub",

		false, CheckModuleHasDependency(t, result.TestContext,

			apiScopePublic.stubsLibraryModuleName("foo"), "android_common",

			apiScopePublic.apiLibraryModuleName("foo")))

}