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

Add yacc generated headers to the include path 

am: e1a3ce3609

Change-Id: I403fa749b607f860298e12454c3774c97e597791
This commit is contained in:
Dan Willemsen 2016-11-03 07:19:07 +00:00 committed by android-build-merger
parent 37e1142b77 e1a3ce3609
commit 967f8d4750
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cc/compiler.go
View File

@ -124,7 +124,7 @@ func (compiler *baseCompiler) compilerDeps(ctx BaseModuleContext, deps Deps) Dep
deps.GeneratedSources = append(deps.GeneratedSources, compiler.Properties.Generated_sources...)
deps.GeneratedHeaders = append(deps.GeneratedHeaders, compiler.Properties.Generated_headers...)
if compiler.hasProto() {
if compiler.hasSrcExt(".proto") {
deps = protoDeps(ctx, deps, &compiler.Proto)
}
@ -322,16 +322,21 @@ func (compiler *baseCompiler) compilerFlags(ctx ModuleContext, flags Flags) Flag
flags.CFlags = append(flags.CFlags, "-DANDROID_STRICT")
}
if compiler.hasProto() {
if compiler.hasSrcExt(".proto") {
flags = protoFlags(ctx, flags, &compiler.Proto)
}
if compiler.hasSrcExt(".y") || compiler.hasSrcExt(".yy") {
flags.GlobalFlags = append(flags.GlobalFlags,
"-I"+android.PathForModuleGen(ctx, "yacc", ctx.ModuleDir()).String())
}
return flags
}
func (compiler *baseCompiler) hasProto() bool {
func (compiler *baseCompiler) hasSrcExt(ext string) bool {
for _, src := range compiler.Properties.Srcs {
if filepath.Ext(src) == ".proto" {
if filepath.Ext(src) == ext {
return true
}
}

2
cc/library.go
View File

@ -477,7 +477,7 @@ func (library *libraryDecorator) link(ctx ModuleContext,
library.reexportFlags(deps.ReexportedFlags)
library.reexportDeps(deps.ReexportedFlagsDeps)
if library.baseCompiler.hasProto() {
if library.baseCompiler.hasSrcExt(".proto") {
if library.Properties.Proto.Export_proto_headers {
library.reexportFlags([]string{
"-I" + protoSubDir(ctx).String(),