diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/java.go | 20 | ||||
| -rw-r--r-- | java/java_test.go | 4 |
2 files changed, 21 insertions, 3 deletions
diff --git a/java/java.go b/java/java.go index 94ec85e76..65e3b4151 100644 --- a/java/java.go +++ b/java/java.go @@ -308,7 +308,7 @@ type sdkDep struct { func sdkStringToNumber(ctx android.BaseContext, v string) int { switch v { case "", "current", "system_current", "test_current": - return 10000 + return android.FutureApiLevel default: if i, err := strconv.Atoi(android.GetNumericSdkVersion(v)); err != nil { ctx.PropertyErrorf("sdk_version", "invalid sdk version") @@ -336,6 +336,22 @@ func decodeSdkDep(ctx android.BaseContext, v string) sdkDep { return sdkDep{} } + // Ensures that the specificed system SDK version is one of BOARD_SYSTEMSDK_VERSIONS (for vendor apks) + // or PRODUCT_SYSTEMSDK_VERSIONS (for other apks or when BOARD_SYSTEMSDK_VERSIONS is not set) + if strings.HasPrefix(v, "system_") && i != android.FutureApiLevel { + allowed_versions := ctx.DeviceConfig().PlatformSystemSdkVersions() + if ctx.DeviceSpecific() || ctx.SocSpecific() { + if len(ctx.DeviceConfig().SystemSdkVersions()) > 0 { + allowed_versions = ctx.DeviceConfig().SystemSdkVersions() + } + } + version := strings.TrimPrefix(v, "system_") + if len(allowed_versions) > 0 && !android.InList(version, allowed_versions) { + ctx.PropertyErrorf("sdk_version", "incompatible sdk version %q. System SDK version should be one of %q", + v, allowed_versions) + } + } + toFile := func(v string) sdkDep { dir := filepath.Join("prebuilts/sdk", v) jar := filepath.Join(dir, "android.jar") @@ -638,7 +654,7 @@ func (j *Module) collectBuilderFlags(ctx android.ModuleContext, deps deps) javaB flags.javaVersion = "1.7" } else if ctx.Device() && sdk <= 26 || !ctx.Config().TargetOpenJDK9() { flags.javaVersion = "1.8" - } else if ctx.Device() && String(j.deviceProperties.Sdk_version) != "" && sdk == 10000 { + } else if ctx.Device() && String(j.deviceProperties.Sdk_version) != "" && sdk == android.FutureApiLevel { // TODO(ccross): once we generate stubs we should be able to use 1.9 for sdk_version: "current" flags.javaVersion = "1.8" } else { diff --git a/java/java_test.go b/java/java_test.go index e8298a224..db0b7a732 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -59,7 +59,9 @@ func testConfig(env map[string]string) android.Config { if env["ANDROID_JAVA8_HOME"] == "" { env["ANDROID_JAVA8_HOME"] = "jdk8" } - return android.TestArchConfig(buildDir, env) + config := android.TestArchConfig(buildDir, env) + config.ProductVariables.DeviceSystemSdkVersions = &[]string{"14", "15"} + return config } |