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
This commit is contained in:
Colin Cross
2017-09-06 12:52:16 -07:00
parent 38f794ee49
commit 4f26bc0263
2 changed files with 17 additions and 0 deletions

View File

@@ -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,