diff options
| author | Colin Cross <ccross@android.com> | 2017-11-14 13:11:23 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2017-11-17 11:22:08 -0800 |
| commit | d5dbfb78a0f30f0b3ee43a514e4f59206c203458 (patch) | |
| tree | d5b4ce3db58fa5fe0ac6714045839cde61ecd3d6 /java/proto.go | |
| parent | f18e11074dc8bd5bd04554b5b088b1d8cc40bc35 (diff) | |
| download | build_soong-d5dbfb78a0f30f0b3ee43a514e4f59206c203458.tar.gz build_soong-d5dbfb78a0f30f0b3ee43a514e4f59206c203458.tar.bz2 build_soong-d5dbfb78a0f30f0b3ee43a514e4f59206c203458.zip | |
Fix proto flags in java
Compute the common proto flags and pass them to the protoc invocation
when generating java files.
Test: m checkbuild
Change-Id: I0d4c23ad001d01eab03b404545383f009214106d
Diffstat (limited to 'java/proto.go')
| -rw-r--r-- | java/proto.go | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/java/proto.go b/java/proto.go index 1077fd69..eeb5124d 100644 --- a/java/proto.go +++ b/java/proto.go @@ -15,6 +15,8 @@ package java import ( + "strings" + "github.com/google/blueprint" "github.com/google/blueprint/proptools" @@ -39,7 +41,7 @@ var ( ) func genProto(ctx android.ModuleContext, outputSrcJar android.WritablePath, - protoFiles android.Paths, protoFlags string, protoOut, protoOutFlags string) { + protoFiles android.Paths, protoFlags []string, protoOut, protoOutFlags string) { ctx.Build(pctx, android.BuildParams{ Rule: proto, @@ -50,7 +52,7 @@ func genProto(ctx android.ModuleContext, outputSrcJar android.WritablePath, "outDir": android.ProtoDir(ctx).String(), "protoOut": protoOut, "protoOutFlags": protoOutFlags, - "protoFlags": protoFlags, + "protoFlags": strings.Join(protoFlags, " "), }, }) } @@ -93,5 +95,8 @@ func protoFlags(ctx android.ModuleContext, p *android.ProtoProperties, flags jav ctx.PropertyErrorf("proto.type", "unknown proto type %q", proptools.String(p.Proto.Type)) } + + flags.protoFlags = android.ProtoFlags(ctx, p) + return flags } |