When compiling with the lite protobuf option, pass the option to aprotoc to force the lite runtime.

Test: make Merged-In: I450f89d144d496a6ddfccc6a6a5a679a05809595 Change-Id: I450f89d144d496a6ddfccc6a6a5a679a05809595
2017-11-18 18:23:14 -08:00
parent bf606c198b
commit 09e94ab074
8 changed files with 76 additions and 62 deletions
--- a/java/builder.go
+++ b/java/builder.go
@@ -200,8 +200,9 @@ type javaBuilderFlags struct {
 	kotlincFlags     string
 	kotlincClasspath classpath

-	protoFlags   []string
-	protoOutFlag string
+	protoFlags       []string
+	protoOutTypeFlag string // The flag itself: --java_out
+	protoOutParams   string // Parameters to that flag: --java_out=$protoOutParams:$outDir
 }

 func TransformKotlinToClasses(ctx android.ModuleContext, outputFile android.WritablePath,