Add yacc generated headers to the include path
Test: mmma -j system/tools/aidl
Change-Id: I444c7f2b004877e027f67e36e016b528511e1a32
diff --git a/cc/compiler.go b/cc/compiler.go
index 454be5e..a14f397 100644
--- a/cc/compiler.go
+++ b/cc/compiler.go
@@ -124,7 +124,7 @@
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 @@
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
}
}