diff options
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/java/java.go b/java/java.go index 37d959bc6..4c614e5df 100644 --- a/java/java.go +++ b/java/java.go @@ -92,6 +92,9 @@ type CompilerProperties struct { // if not blank, run jarjar using the specified rules file Jarjar_rules *string + + // If not blank, set the java version passed to javac as -source and -target + Java_version *string } type CompilerDeviceProperties struct { @@ -285,6 +288,13 @@ func (j *Module) compile(ctx android.ModuleContext) { var flags javaBuilderFlags javacFlags := j.properties.Javacflags + + if j.properties.Java_version != nil { + flags.javaVersion = *j.properties.Java_version + } else { + flags.javaVersion = "${config.DefaultJavaVersion}" + } + if len(javacFlags) > 0 { ctx.Variable(pctx, "javacFlags", strings.Join(javacFlags, " ")) flags.javacFlags = "$javacFlags" |