diff options
| author | Colin Cross <ccross@android.com> | 2019-02-04 10:09:01 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2019-02-04 10:09:01 -0800 |
| commit | 5e24ba9886f598a59c6c41911e41ab2c9d043a0b (patch) | |
| tree | d5dae8113aa1ebf14546c3691eb66c76ff5ee8ca /java/java_test.go | |
| parent | a9ff887f48c1ca50694fb3af081a0fd0aebbd294 (diff) | |
| parent | dec157bd6c01da7817ac69a01d75d25ee7150848 (diff) | |
| download | android_build_soong-5e24ba9886f598a59c6c41911e41ab2c9d043a0b.tar.gz android_build_soong-5e24ba9886f598a59c6c41911e41ab2c9d043a0b.tar.bz2 android_build_soong-5e24ba9886f598a59c6c41911e41ab2c9d043a0b.zip | |
resolve merge conflicts of dec157bd6c01da7817ac69a01d75d25ee7150848 to master
Bug: None
Test: treehugger
Change-Id: I701d7a4ee893eb4113a48eaee9930eceec478a29
Diffstat (limited to 'java/java_test.go')
| -rw-r--r-- | java/java_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/java_test.go b/java/java_test.go index a8cbfd1d..86dc6959 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -61,7 +61,7 @@ func testConfig(env map[string]string) android.Config { env["ANDROID_JAVA8_HOME"] = "jdk8" } config := android.TestArchConfig(buildDir, env) - config.TestProductVariables.DeviceSystemSdkVersions = &[]string{"14", "15"} + config.TestProductVariables.DeviceSystemSdkVersions = []string{"14", "15"} return config } |