From 2ebc47664648985a2f1fd4814ff19122148c6f85 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Fri, 20 Oct 2017 14:00:31 -0700 Subject: Use prebuilts/sdk/*current until Soong can generate stubs The android_*stubs_current modules don't yet exist, so fall back to the prebuilt jars for now. Test: m checkbuild Change-Id: Iabd32b30954b3f4a6d9a779fde52a032b684807e --- java/java.go | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) (limited to 'java/java.go') diff --git a/java/java.go b/java/java.go index 7fdf94eba..497b28510 100644 --- a/java/java.go +++ b/java/java.go @@ -271,13 +271,13 @@ func decodeSdkDep(ctx android.BaseContext, v string) sdkDep { } } - toModule := func(m string) sdkDep { - return sdkDep{ - useModule: true, - module: m, - systemModules: m + "_system_modules", - } - } + //toModule := func(m string) sdkDep { + // return sdkDep{ + // useModule: true, + // module: m, + // systemModules: m + "_system_modules", + // } + //} if ctx.AConfig().UnbundledBuild() && v != "" { return toFile(v) @@ -288,12 +288,14 @@ func decodeSdkDep(ctx android.BaseContext, v string) sdkDep { return sdkDep{ useDefaultLibs: true, } - case "current": - return toModule("android_stubs_current") - case "system_current": - return toModule("android_system_stubs_current") - case "test_current": - return toModule("android_test_stubs_current") + // TODO(ccross): re-enable these once we generate stubs, until then + // use the stubs in prebuilts/sdk/*current + //case "current": + // return toModule("android_stubs_current") + //case "system_current": + // return toModule("android_system_stubs_current") + //case "test_current": + // return toModule("android_test_stubs_current") default: return toFile(v) } @@ -478,6 +480,9 @@ func (j *Module) collectBuilderFlags(ctx android.ModuleContext, deps deps) javaB flags.javaVersion = "1.7" } else if ctx.Device() && sdk <= 26 || !ctx.AConfig().TargetOpenJDK9() { flags.javaVersion = "1.8" + } else if ctx.Device() && j.deviceProperties.Sdk_version != "" && sdk == 10000 { + // TODO(ccross): once we generate stubs we should be able to use 1.9 for sdk_version: "current" + flags.javaVersion = "1.8" } else { flags.javaVersion = "1.9" } -- cgit v1.2.3-59-g8ed1b