commit dc23131b07748c85047ed9309b30c4fb41f1de0c
author Treehugger Robot <treehugger-gerrit@google.com> Fri Aug 16 01:05:41 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Aug 16 01:05:41 2019 +0000
tree e41903f16d36c50ed317dd2601de87801a850c14
parent fd26de477f3eda37f82a5c883bfc711bd4fc8f9a
parent b13f9c520c7c869977449fd59ace156495a66536

Merge "Handle the case when OUT_DIR is not set."

java/proto.go

diff --git a/java/proto.go b/java/proto.go
index 0ec6499..22a3eed 100644
--- a/java/proto.go
+++ b/java/proto.go
@@ -75,9 +75,11 @@
 	flags.proto = android.GetProtoFlags(ctx, p)
 
 	if String(p.Proto.Plugin) == "" {
+		var typeToPlugin string
 		switch String(p.Proto.Type) {
 		case "micro":
 			flags.proto.OutTypeFlag = "--javamicro_out"
+			typeToPlugin = "javamicro"
 		case "nano":
 			flags.proto.OutTypeFlag = "--javanano_out"
 		case "lite":
@@ -89,6 +91,12 @@
 			ctx.PropertyErrorf("proto.type", "unknown proto type %q",
 				String(p.Proto.Type))
 		}
+
+		if typeToPlugin != "" {
+			hostTool := ctx.Config().HostToolPath(ctx, "protoc-gen-"+typeToPlugin)
+			flags.proto.Deps = append(flags.proto.Deps, hostTool)
+			flags.proto.Flags = append(flags.proto.Flags, "--plugin=protoc-gen-"+typeToPlugin+"="+hostTool.String())
+		}
 	}
 
 	flags.proto.OutParams = append(flags.proto.OutParams, j.Proto.Output_params...)