diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2018-03-12 18:06:05 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2018-04-17 10:34:23 -0700 |
| commit | cb3bff1b65a696e698ca98a490538d4eb7e18884 (patch) | |
| tree | a79fcd77cdada2d8f491f87c63280c9ef634ca6f /cc | |
| parent | 050ca73dbfdd360a209daf93a6f7d059a8705569 (diff) | |
| download | build_soong-cb3bff1b65a696e698ca98a490538d4eb7e18884.tar.gz build_soong-cb3bff1b65a696e698ca98a490538d4eb7e18884.tar.bz2 build_soong-cb3bff1b65a696e698ca98a490538d4eb7e18884.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
Merged-In: Iccfb4c912f8e0ee3f620cc1ee00f0cdc5cba7735
(cherry picked from commit 674dc7f7f06dc56edc7e331331d474dcf1bba53d)
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/cc_test.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cc/cc_test.go b/cc/cc_test.go index f315b1d7..a4e25349 100644 --- a/cc/cc_test.go +++ b/cc/cc_test.go @@ -188,8 +188,8 @@ func testCcWithConfig(t *testing.T, bp string, config android.Config) *android.T func testCc(t *testing.T, bp string) *android.TestContext { t.Helper() config := android.TestArchConfig(buildDir, nil) - config.ProductVariables.DeviceVndkVersion = StringPtr("current") - config.ProductVariables.Platform_vndk_version = StringPtr("VER") + config.TestProductVariables.DeviceVndkVersion = StringPtr("current") + config.TestProductVariables.Platform_vndk_version = StringPtr("VER") return testCcWithConfig(t, bp, config) } @@ -197,7 +197,7 @@ func testCc(t *testing.T, bp string) *android.TestContext { func testCcNoVndk(t *testing.T, bp string) *android.TestContext { t.Helper() config := android.TestArchConfig(buildDir, nil) - config.ProductVariables.Platform_vndk_version = StringPtr("VER") + config.TestProductVariables.Platform_vndk_version = StringPtr("VER") return testCcWithConfig(t, bp, config) } @@ -205,8 +205,8 @@ func testCcNoVndk(t *testing.T, bp string) *android.TestContext { func testCcError(t *testing.T, pattern string, bp string) { t.Helper() config := android.TestArchConfig(buildDir, nil) - config.ProductVariables.DeviceVndkVersion = StringPtr("current") - config.ProductVariables.Platform_vndk_version = StringPtr("VER") + config.TestProductVariables.DeviceVndkVersion = StringPtr("current") + config.TestProductVariables.Platform_vndk_version = StringPtr("VER") ctx := createTestContext(t, config, bp) |