diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2018-03-12 18:06:05 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2018-04-11 01:45:22 +0000 |
| commit | 674dc7f7f06dc56edc7e331331d474dcf1bba53d (patch) | |
| tree | 71c3ef9cfc2325a0e47f0a1b65e0107fdbcc7e94 /android | |
| parent | 3fb1faeeb98143e132ca4d6f1cac42d6f060888b (diff) | |
| download | build_soong-674dc7f7f06dc56edc7e331331d474dcf1bba53d.tar.gz build_soong-674dc7f7f06dc56edc7e331331d474dcf1bba53d.tar.bz2 build_soong-674dc7f7f06dc56edc7e331331d474dcf1bba53d.zip | |
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
Diffstat (limited to 'android')
| -rw-r--r-- | android/config.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/android/config.go b/android/config.go index e14f42ee..642fa729 100644 --- a/android/config.go +++ b/android/config.go @@ -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) |