diff options
Diffstat (limited to 'rust/bindgen.go')
| -rw-r--r-- | rust/bindgen.go | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/rust/bindgen.go b/rust/bindgen.go index 03363085b..cafdb8bfa 100644 --- a/rust/bindgen.go +++ b/rust/bindgen.go @@ -27,15 +27,14 @@ var ( defaultBindgenFlags = []string{""} // bindgen should specify its own Clang revision so updating Clang isn't potentially blocked on bindgen failures. - bindgenClangVersion = "clang-r383902c" - bindgenLibClangSoGit = "11git" + bindgenClangVersion = "clang-r383902c" //TODO(b/160803703) Use a prebuilt bindgen instead of the built bindgen. _ = pctx.SourcePathVariable("bindgenCmd", "out/host/${config.HostPrebuiltTag}/bin/bindgen") _ = pctx.SourcePathVariable("bindgenClang", "${cc_config.ClangBase}/${config.HostPrebuiltTag}/"+bindgenClangVersion+"/bin/clang") _ = pctx.SourcePathVariable("bindgenLibClang", - "${cc_config.ClangBase}/${config.HostPrebuiltTag}/"+bindgenClangVersion+"/lib64/libclang.so."+bindgenLibClangSoGit) + "${cc_config.ClangBase}/${config.HostPrebuiltTag}/"+bindgenClangVersion+"/lib64/") //TODO(ivanlozano) Switch this to RuleBuilder bindgen = pctx.AndroidStaticRule("bindgen", @@ -97,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}") |