diff --git a/android/config.go b/android/config.go
index 213fa2f6b..4c31bb052 100644
--- a/android/config.go
+++ b/android/config.go
@@ -2124,3 +2124,8 @@ func (c *deviceConfig) ReleaseExposeFlaggedApi() bool {
 func (c *deviceConfig) HideFlaggedApis() bool {
 	return c.NextReleaseHideFlaggedApi() && !c.ReleaseExposeFlaggedApi()
 }
+
+func (c *config) GetBuildFlag(name string) (string, bool) {
+	val, ok := c.productVariables.BuildFlags[name]
+	return val, ok
+}
diff --git a/android/variable.go b/android/variable.go
index 9896f2020..648e4cf18 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -492,6 +492,8 @@ type ProductVariables struct {
 	NextReleaseHideFlaggedApi *bool `json:",omitempty"`
 
 	Release_expose_flagged_api *bool `json:",omitempty"`
+
+	BuildFlags map[string]string `json:",omitempty"`
 }
 
 type PartitionQualifiedVariablesType struct {