diff options
| author | Colin Cross <ccross@android.com> | 2017-12-14 15:22:43 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2017-12-15 13:42:09 -0800 |
| commit | 0f2ee15576d8d0eb8a8617ba1dd4493f6169bbd7 (patch) | |
| tree | 3ed2016865d9e181f76eee4c3053b42ddb5c54f8 /java/java.go | |
| parent | 5dfabfba3e13a7349a6a87bd201c5e45a8754edc (diff) | |
Support output params in java proto
Allow java modules using proto to specify output params to be
passed to the proto generator.
Test: m checkbuild
Change-Id: I8a06f07218073236f4f85996ea5f09fb3702ed1a
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/java/java.go b/java/java.go index d9075b175..9b345fdcd 100644 --- a/java/java.go +++ b/java/java.go @@ -142,6 +142,11 @@ type CompilerProperties struct { Exclude_filter []string } + Proto struct { + // List of extra options that will be passed to the proto generator. + Output_params []string + } + Instrument bool `blueprint:"mutated"` } @@ -620,7 +625,7 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars ...android.Path } srcFiles := ctx.ExpandSources(j.properties.Srcs, j.properties.Exclude_srcs) if hasSrcExt(srcFiles.Strings(), ".proto") { - flags = protoFlags(ctx, &j.protoProperties, flags) + flags = protoFlags(ctx, &j.properties, &j.protoProperties, flags) } srcFiles = j.genSources(ctx, srcFiles, flags) |