tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Ensure -I . is the first protoc argument"

Browse source 
am: 32bf18b10a

Change-Id: If870b412d8b8f8cac0d9de57b355f53cb5e6f3ae
This commit is contained in:
Colin Cross 2017-12-20 00:45:34 +00:00 committed by android-build-merger
commit 2d1b27c08b
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.
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 {
localProtoIncludeDirs := PathsForModuleSrc(ctx, p.Proto.Local_include_dirs)
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, "-I .")
return protoFlags
}