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

Commit 33e39ae5 authored by Jihoon Kang's avatar Jihoon Kang
Browse files

Modify conditionals for BuildFromTextStub() 

This change modifies config.BuildFromTextStub() to return false when
deviceConfig.BuildFromSourceStub() is set to true.

Test: m nothing
Bug: 311203379
Change-Id: I3b56881fbe2565da20e23470398bf6550c618fb0
parent bc1d0d8c

android/config.go

+7 −1
Original line number Diff line number Diff line
@@ -2075,11 +2075,17 @@ 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.IsEnvTrue("BUILD_FROM_SOURCE_STUB")

	return !c.buildFromSourceStub &&

		!c.JavaCoverageEnabled() &&

		!c.deviceConfig.BuildFromSourceStub()

}



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

android/variable.go

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



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



	BuildFromSourceStub *bool `json:",omitempty"`

}



type PartitionQualifiedVariablesType struct {