From 33e39ae583fc0d18d4459204df4ff72bbb77ee0b Mon Sep 17 00:00:00 2001
From: Jihoon Kang <jihoonkang@google.com>
Date: Thu, 16 Nov 2023 19:07:04 +0000
Subject: [PATCH] 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
---
 android/config.go   | 8 +++++++-
 android/variable.go | 2 ++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/android/config.go b/android/config.go
index 572e006a1..f00e79958 100644
--- a/android/config.go
+++ b/android/config.go
@@ -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) {
diff --git a/android/variable.go b/android/variable.go
index 648e4cf18..fe3a6d790 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -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 {