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

Commit 88d5104c authored by Jihoon Kang's avatar Jihoon Kang Committed by Gerrit Code Review
Browse files

Merge "Revert "Modify conditionals for BuildFromTextStub()"" into main

parents 72a8cee8 77f6ca49

android/config.go

+1 −7
Original line number Diff line number Diff line
@@ -2075,17 +2075,11 @@ func (c *config) JavaCoverageEnabled() bool { 
	return c.IsEnvTrue("EMMA_INSTRUMENT") || c.IsEnvTrue("EMMA_INSTRUMENT_STATIC") || c.IsEnvTrue("EMMA_INSTRUMENT_FRAMEWORK")

}



func (c *deviceConfig) BuildFromSourceStub() bool {

	return Bool(c.config.productVariables.BuildFromSourceStub)

}



func (c *config) BuildFromTextStub() bool {

	// 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.buildFromSourceStub &&

		!c.JavaCoverageEnabled() &&

		!c.deviceConfig.BuildFromSourceStub()

	return !c.buildFromSourceStub && !c.JavaCoverageEnabled() && !c.IsEnvTrue("BUILD_FROM_SOURCE_STUB")

}



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

android/variable.go

+0 −2
Original line number Diff line number Diff line
@@ -494,8 +494,6 @@ type ProductVariables struct { 
	Release_expose_flagged_api *bool `json:",omitempty"`



	BuildFlags map[string]string `json:",omitempty"`



	BuildFromSourceStub *bool `json:",omitempty"`

}



type PartitionQualifiedVariablesType struct {