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

Merge "Modify conditionals for BuildFromTextStub()" into main

Browse Source
This commit is contained in:
Treehugger Robot
2023-11-17 00:29:05 +00:00
committed by Gerrit Code Review
parent c3b56b8403 33e39ae583
commit 72a8cee8fe
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
android/config.go
View File

@@ -2075,11 +2075,17 @@ func (c *config) JavaCoverageEnabled() bool {
return c.IsEnvTrue("EMMA_INSTRUMENT") || c.IsEnvTrue("EMMA_INSTRUMENT_STATIC") || c.IsEnvTrue("EMMA_INSTRUMENT_FRAMEWORK") 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 { func (c *config) BuildFromTextStub() bool {
// TODO: b/302320354 - Remove the coverage build specific logic once the // TODO: b/302320354 - Remove the coverage build specific logic once the
// robust solution for handling native properties in from-text stub build // robust solution for handling native properties in from-text stub build
// is implemented. // 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) { func (c *config) SetBuildFromTextStub(b bool) {

2
android/variable.go
View File

@@ -494,6 +494,8 @@ type ProductVariables struct {
Release_expose_flagged_api *bool `json:",omitempty"` Release_expose_flagged_api *bool `json:",omitempty"`
BuildFlags map[string]string `json:",omitempty"` BuildFlags map[string]string `json:",omitempty"`
BuildFromSourceStub *bool `json:",omitempty"`
} }
type PartitionQualifiedVariablesType struct { type PartitionQualifiedVariablesType struct {