Merge "Revert "Modify conditionals for BuildFromTextStub()"" into main
diff --git a/android/config.go b/android/config.go
index f00e799..572e006 100644
--- a/android/config.go
+++ b/android/config.go
@@ -2075,17 +2075,11 @@
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) {
diff --git a/android/variable.go b/android/variable.go
index fe3a6d7..648e4cf 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -494,8 +494,6 @@
Release_expose_flagged_api *bool `json:",omitempty"`
BuildFlags map[string]string `json:",omitempty"`
-
- BuildFromSourceStub *bool `json:",omitempty"`
}
type PartitionQualifiedVariablesType struct {