StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Call rustfmt on rust_bindgen bindings.

Browse Source 
This makes debugging easier when the bindings contain errors.

Bug: 161730753
Test: Generated bindings are formatted.
Change-Id: Ic46f69d8b6d07b4dc6912b7f02d7427ea6c11cde
This commit is contained in:
Ivan Lozano
2020-07-22 16:48:53 -04:00
parent 188f2ee1ee
commit ec54eec571
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rust/bindgen.go
View File

@@ -24,7 +24,7 @@ import (
) )
var ( var (
defaultBindgenFlags = []string{"--no-rustfmt-bindings"} defaultBindgenFlags = []string{""}
// bindgen should specify its own Clang revision so updating Clang isn't potentially blocked on bindgen failures. // bindgen should specify its own Clang revision so updating Clang isn't potentially blocked on bindgen failures.
bindgenClangVersion = "clang-r383902c" bindgenClangVersion = "clang-r383902c"
@@ -40,7 +40,8 @@ var (
//TODO(ivanlozano) Switch this to RuleBuilder //TODO(ivanlozano) Switch this to RuleBuilder
bindgen = pctx.AndroidStaticRule("bindgen", bindgen = pctx.AndroidStaticRule("bindgen",
blueprint.RuleParams{ blueprint.RuleParams{
Command: "CLANG_PATH=$bindgenClang LIBCLANG_PATH=$bindgenLibClang $bindgenCmd $flags $in -o $out -- $cflags", Command: "CLANG_PATH=$bindgenClang LIBCLANG_PATH=$bindgenLibClang RUSTFMT=${config.RustBin}/rustfmt " +
"$bindgenCmd $flags $in -o $out -- $cflags",
CommandDeps: []string{"$bindgenCmd"}, CommandDeps: []string{"$bindgenCmd"},
}, },
"flags", "cflags") "flags", "cflags")