diff options
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 } |