Expose ProductVariables from TestConfig
In preparation for unexporting ProductVariables, explicitly return a pointer to the structure from TestConfig / TestArchConfig. Bug: 76168832 Test: m blueprint_tools Change-Id: Iccfb4c912f8e0ee3f620cc1ee00f0cdc5cba7735
This commit is contained in:
@@ -69,6 +69,9 @@ type config struct {
|
||||
FileConfigurableOptions
|
||||
ProductVariables productVariables
|
||||
|
||||
// Only available on configs created by TestConfig
|
||||
TestProductVariables *productVariables
|
||||
|
||||
PrimaryBuilder string
|
||||
ConfigFileName string
|
||||
ProductVariablesFileName string
|
||||
@@ -197,6 +200,7 @@ func TestConfig(buildDir string, env map[string]string) Config {
|
||||
config.deviceConfig = &deviceConfig{
|
||||
config: config,
|
||||
}
|
||||
config.TestProductVariables = &config.ProductVariables
|
||||
|
||||
if err := config.fromEnv(); err != nil {
|
||||
panic(err)
|
||||
|
Reference in New Issue
Block a user