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

Merge "rust: Fix rust_bindgen implicits" am: 74fe471e7a 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1414831

Change-Id: I9d5d0da0f409bd6b131f7e0f6363be061d3045c1
This commit is contained in:
Ivan Lozano 2020-09-09 22:33:23 +00:00 committed by Automerger Merge Worker
parent e9505a11dc 74fe471e7a
commit fbd7372401
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rust/bindgen.go
View File

@ -96,8 +96,7 @@ func (b *bindgenDecorator) GenerateSource(ctx ModuleContext, deps PathDeps) andr
var cflags []string var cflags []string
var implicits android.Paths var implicits android.Paths
implicits = append(implicits, deps.depIncludePaths...) implicits = append(implicits, deps.depGeneratedHeaders...)
implicits = append(implicits, deps.depSystemIncludePaths...)
// Default clang flags // Default clang flags
cflags = append(cflags, "${cc_config.CommonClangGlobalCflags}") cflags = append(cflags, "${cc_config.CommonClangGlobalCflags}")

3
rust/rust.go
View File

@ -258,6 +258,7 @@ type PathDeps struct {
// Used by bindgen modules which call clang // Used by bindgen modules which call clang
depClangFlags []string depClangFlags []string
depIncludePaths android.Paths depIncludePaths android.Paths
depGeneratedHeaders android.Paths
depSystemIncludePaths android.Paths depSystemIncludePaths android.Paths
coverageFiles android.Paths coverageFiles android.Paths
@ -875,6 +876,7 @@ func (mod *Module) depsToPaths(ctx android.ModuleContext) PathDeps {
if mod, ok := ccDep.(*cc.Module); ok { if mod, ok := ccDep.(*cc.Module); ok {
depPaths.depSystemIncludePaths = append(depPaths.depSystemIncludePaths, mod.ExportedSystemIncludeDirs()...) depPaths.depSystemIncludePaths = append(depPaths.depSystemIncludePaths, mod.ExportedSystemIncludeDirs()...)
depPaths.depClangFlags = append(depPaths.depClangFlags, mod.ExportedFlags()...) depPaths.depClangFlags = append(depPaths.depClangFlags, mod.ExportedFlags()...)
depPaths.depGeneratedHeaders = append(depPaths.depGeneratedHeaders, mod.ExportedGeneratedHeaders()...)
} }
depPaths.coverageFiles = append(depPaths.coverageFiles, ccDep.CoverageFiles()...) depPaths.coverageFiles = append(depPaths.coverageFiles, ccDep.CoverageFiles()...)
directStaticLibDeps = append(directStaticLibDeps, ccDep) directStaticLibDeps = append(directStaticLibDeps, ccDep)
@ -886,6 +888,7 @@ func (mod *Module) depsToPaths(ctx android.ModuleContext) PathDeps {
if mod, ok := ccDep.(*cc.Module); ok { if mod, ok := ccDep.(*cc.Module); ok {
depPaths.depSystemIncludePaths = append(depPaths.depSystemIncludePaths, mod.ExportedSystemIncludeDirs()...) depPaths.depSystemIncludePaths = append(depPaths.depSystemIncludePaths, mod.ExportedSystemIncludeDirs()...)
depPaths.depClangFlags = append(depPaths.depClangFlags, mod.ExportedFlags()...) depPaths.depClangFlags = append(depPaths.depClangFlags, mod.ExportedFlags()...)
depPaths.depGeneratedHeaders = append(depPaths.depGeneratedHeaders, mod.ExportedGeneratedHeaders()...)
} }
directSharedLibDeps = append(directSharedLibDeps, ccDep) directSharedLibDeps = append(directSharedLibDeps, ccDep)
mod.Properties.AndroidMkSharedLibs = append(mod.Properties.AndroidMkSharedLibs, depName) mod.Properties.AndroidMkSharedLibs = append(mod.Properties.AndroidMkSharedLibs, depName)