summaryrefslogtreecommitdiff
path: root/java/testing.go
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2019-04-02 16:10:56 -0700
committer Colin Cross <ccross@android.com> 2019-04-02 23:18:30 +0000
commitff0daf4ccf2f1ef65dad34a971a1f3c65827f744 (patch)
treed39ed037e1b949afb6283157b9058d98b7f80b1d /java/testing.go
parent9a4f3f7ea87d983ddf69831a9e197f6b62d4d873 (diff)
Fix sdk_version: "system_current" when Platform_sdk_final=true
When PLATFORM_VERSION_CODENAME is set to REL Platform_sdk_final becomes true, which causes the return value of sdkVersionToNumber for "system_current" to a real version number instead of FutureApiLevel. This enables the check against PlatformSystemSdkVersions, which doesn't contain "current". Use the numeric value instead. Fixes: 129786845 Test: sdk_test.go Change-Id: If7cf211cc01c5fbf3e3ece3c3f604718a13d5a9b
Diffstat (limited to 'java/testing.go')
-rw-r--r--java/testing.go1
1 files changed, 0 insertions, 1 deletions
diff --git a/java/testing.go b/java/testing.go
index 6febfa1d3..7d23d8f7e 100644
--- a/java/testing.go
+++ b/java/testing.go
@@ -28,7 +28,6 @@ func TestConfig(buildDir string, env map[string]string) android.Config {
env["ANDROID_JAVA8_HOME"] = "jdk8"
}
config := android.TestArchConfig(buildDir, env)
- config.TestProductVariables.DeviceSystemSdkVersions = []string{"14", "15"}
return config
}