diff options
| author | 2022-04-29 01:43:20 +0000 | |
|---|---|---|
| committer | 2022-04-29 01:43:20 +0000 | |
| commit | 775b44fa506aeca3ea0898c275ed1bf3cb0bf2c4 (patch) | |
| tree | c8a67dd96d200d2af5bbd193befa5465f5c83e58 /java/java.go | |
| parent | 28881cbd554f998da71ec7d52a84fce1837d98b0 (diff) | |
| parent | 3ac6daf47c5699f9e0e7878b3c97882c498ab898 (diff) | |
Merge "bp2build converts java_version property to javacopts attribute"
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/java/java.go b/java/java.go index b34d6de8a..4e7e14c07 100644 --- a/java/java.go +++ b/java/java.go @@ -2089,6 +2089,11 @@ func (m *Library) convertLibraryAttrsBp2Build(ctx android.TopDownMutatorContext) if m.properties.Javacflags != nil { javacopts = append(javacopts, m.properties.Javacflags...) } + if m.properties.Java_version != nil { + javaVersion := normalizeJavaVersion(ctx, *m.properties.Java_version).String() + javacopts = append(javacopts, fmt.Sprintf("-source %s -target %s", javaVersion, javaVersion)) + } + epEnabled := m.properties.Errorprone.Enabled //TODO(b/227504307) add configuration that depends on RUN_ERROR_PRONE environment variable if Bool(epEnabled) { |