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 /java | |
| 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 'java')
| -rw-r--r-- | java/app_test.go | 6 | ||||
| -rw-r--r-- | java/java_test.go | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/java/app_test.go b/java/app_test.go index d3216bfd..ba017a18 100644 --- a/java/app_test.go +++ b/java/app_test.go @@ -188,12 +188,12 @@ func TestEnforceRRO(t *testing.T) { for _, testCase := range testEnforceRROTests { t.Run(testCase.name, func(t *testing.T) { config := testConfig(nil) - config.ProductVariables.ResourceOverlays = &resourceOverlays + config.TestProductVariables.ResourceOverlays = &resourceOverlays if testCase.enforceRROTargets != nil { - config.ProductVariables.EnforceRROTargets = &testCase.enforceRROTargets + config.TestProductVariables.EnforceRROTargets = &testCase.enforceRROTargets } if testCase.enforceRROExcludedOverlays != nil { - config.ProductVariables.EnforceRROExcludedOverlays = &testCase.enforceRROExcludedOverlays + config.TestProductVariables.EnforceRROExcludedOverlays = &testCase.enforceRROExcludedOverlays } ctx := testAppContext(config, bp, fs) diff --git a/java/java_test.go b/java/java_test.go index 6ef406f7..015c2331 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -60,7 +60,7 @@ func testConfig(env map[string]string) android.Config { env["ANDROID_JAVA8_HOME"] = "jdk8" } config := android.TestArchConfig(buildDir, env) - config.ProductVariables.DeviceSystemSdkVersions = &[]string{"14", "15"} + config.TestProductVariables.DeviceSystemSdkVersions = &[]string{"14", "15"} return config } |