summaryrefslogtreecommitdiff
path: root/java/java.go
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2017-09-06 12:52:16 -0700
committerColin Cross <ccross@android.com>2017-09-11 13:14:21 -0700
commit4f26bc0263fb15d8edabe938337e3cfad6ee6862 (patch)
tree84cfe851a61f80c68f1e5710170e2f7ea2872e76 /java/java.go
parent38f794ee496764f1b429c1786cf84758ba6f00a8 (diff)
Strip javac 9 module arguments
Strip module-related javac 9 command line arguments that don't apply to javac 8. Test: m -j checkbuild Change-Id: If44a3d9d7227e923117dc75bbabbddb41026b25d
Diffstat (limited to 'java/java.go')
-rw-r--r--java/java.go3
1 files changed, 3 insertions, 0 deletions
diff --git a/java/java.go b/java/java.go
index b4ed20765..2298acc37 100644
--- a/java/java.go
+++ b/java/java.go
@@ -301,6 +301,9 @@ func (j *Module) compile(ctx android.ModuleContext) {
var flags javaBuilderFlags
javacFlags := j.properties.Javacflags
+ if ctx.AConfig().Getenv("EXPERIMENTAL_USE_OPENJDK9") == "" {
+ javacFlags = config.StripJavac9Flags(javacFlags)
+ }
if len(deps.annotationProcessors) > 0 {
javacFlags = append(javacFlags,