openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Ensure -I . is the first protoc argument 

The first include directory affects where protoc places the
output files.  Ensure -I . is always the first protoc argument.

Bug: 70704330
Test: m checkbuild
Change-Id: I4992e4074f612409865e6e18dc8993c6f68385fd
This commit is contained in:
Colin Cross 2017-12-15 13:41:30 -08:00
parent 0f2ee15576
commit a3b25001e8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
android/proto.go
View File

@ -23,7 +23,9 @@ package android
// generate the source. // generate the source.
func ProtoFlags(ctx ModuleContext, p *ProtoProperties) []string { func ProtoFlags(ctx ModuleContext, p *ProtoProperties) []string {
var protoFlags []string // -I . must come first, it affects where protoc places the output files.
protoFlags := []string{"-I ."}
if len(p.Proto.Local_include_dirs) > 0 { if len(p.Proto.Local_include_dirs) > 0 {
localProtoIncludeDirs := PathsForModuleSrc(ctx, p.Proto.Local_include_dirs) localProtoIncludeDirs := PathsForModuleSrc(ctx, p.Proto.Local_include_dirs)
protoFlags = append(protoFlags, JoinWithPrefix(localProtoIncludeDirs.Strings(), "-I")) protoFlags = append(protoFlags, JoinWithPrefix(localProtoIncludeDirs.Strings(), "-I"))
@ -33,8 +35,6 @@ func ProtoFlags(ctx ModuleContext, p *ProtoProperties) []string {
protoFlags = append(protoFlags, JoinWithPrefix(rootProtoIncludeDirs.Strings(), "-I")) protoFlags = append(protoFlags, JoinWithPrefix(rootProtoIncludeDirs.Strings(), "-I"))
} }
protoFlags = append(protoFlags, "-I .")
return protoFlags return protoFlags
} }