diff --git a/rust/bindgen.go b/rust/bindgen.go index 45a479bc8..cafdb8bfa 100644 --- a/rust/bindgen.go +++ b/rust/bindgen.go @@ -96,8 +96,7 @@ func (b *bindgenDecorator) GenerateSource(ctx ModuleContext, deps PathDeps) andr var cflags []string var implicits android.Paths - implicits = append(implicits, deps.depIncludePaths...) - implicits = append(implicits, deps.depSystemIncludePaths...) + implicits = append(implicits, deps.depGeneratedHeaders...) // Default clang flags cflags = append(cflags, "${cc_config.CommonClangGlobalCflags}") diff --git a/rust/rust.go b/rust/rust.go index 5c6cdb792..4cba6d6b1 100644 --- a/rust/rust.go +++ b/rust/rust.go @@ -258,6 +258,7 @@ type PathDeps struct { // Used by bindgen modules which call clang depClangFlags []string depIncludePaths android.Paths + depGeneratedHeaders android.Paths depSystemIncludePaths android.Paths coverageFiles android.Paths @@ -875,6 +876,7 @@ func (mod *Module) depsToPaths(ctx android.ModuleContext) PathDeps { if mod, ok := ccDep.(*cc.Module); ok { depPaths.depSystemIncludePaths = append(depPaths.depSystemIncludePaths, mod.ExportedSystemIncludeDirs()...) depPaths.depClangFlags = append(depPaths.depClangFlags, mod.ExportedFlags()...) + depPaths.depGeneratedHeaders = append(depPaths.depGeneratedHeaders, mod.ExportedGeneratedHeaders()...) } depPaths.coverageFiles = append(depPaths.coverageFiles, ccDep.CoverageFiles()...) directStaticLibDeps = append(directStaticLibDeps, ccDep) @@ -886,6 +888,7 @@ func (mod *Module) depsToPaths(ctx android.ModuleContext) PathDeps { if mod, ok := ccDep.(*cc.Module); ok { depPaths.depSystemIncludePaths = append(depPaths.depSystemIncludePaths, mod.ExportedSystemIncludeDirs()...) depPaths.depClangFlags = append(depPaths.depClangFlags, mod.ExportedFlags()...) + depPaths.depGeneratedHeaders = append(depPaths.depGeneratedHeaders, mod.ExportedGeneratedHeaders()...) } directSharedLibDeps = append(directSharedLibDeps, ccDep) mod.Properties.AndroidMkSharedLibs = append(mod.Properties.AndroidMkSharedLibs, depName)