Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ddd0bdb3 authored by Ivan Lozano's avatar Ivan Lozano
Browse files

rust: Fix rust_bindgen implicits 

rust_bindgen implicits currently include dependency-exported include
directories. This is incorrect, and causes issues when the include
directory is a generated directory.

Instead, remove the dependency-exported include directories from the
implicits list, and also add dependency-exported headers to the
implicits to handle these correctly.

Bug: 166779501
Test: Rust projects continue to build, test-case no longer failing.
Change-Id: Ia2da25de9e712b7306f19603dc9d14de6bac3fb3
parent 682c9d7b

rust/bindgen.go

+1 −2
Original line number Diff line number Diff line
@@ -97,8 +97,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}")

rust/rust.go

+3 −0
Original line number Diff line number Diff line
@@ -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)