StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make javamicro a plugin"

Browse Source 
am: fd26de477f

Change-Id: Ibb4cf9da092e3e04275a4d5f441e59d4fb6f9d02
This commit is contained in:
Colin Cross
2019-08-15 13:13:46 -07:00
committed by android-build-merger
parent 0018e85876 fd26de477f
commit 31a23c657b
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
java/proto.go
View File

@@ -75,9 +75,11 @@ func protoFlags(ctx android.ModuleContext, j *CompilerProperties, p *android.Pro
flags.proto = android.GetProtoFlags(ctx, p) flags.proto = android.GetProtoFlags(ctx, p)
if String(p.Proto.Plugin) == "" { if String(p.Proto.Plugin) == "" {
var typeToPlugin string
switch String(p.Proto.Type) { switch String(p.Proto.Type) {
case "micro": case "micro":
flags.proto.OutTypeFlag = "--javamicro_out" flags.proto.OutTypeFlag = "--javamicro_out"
typeToPlugin = "javamicro"
case "nano": case "nano":
flags.proto.OutTypeFlag = "--javanano_out" flags.proto.OutTypeFlag = "--javanano_out"
case "lite": case "lite":
@@ -89,6 +91,12 @@ func protoFlags(ctx android.ModuleContext, j *CompilerProperties, p *android.Pro
ctx.PropertyErrorf("proto.type", "unknown proto type %q", ctx.PropertyErrorf("proto.type", "unknown proto type %q",
String(p.Proto.Type)) 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...) flags.proto.OutParams = append(flags.proto.OutParams, j.Proto.Output_params...)