diff options
| author | 2024-06-14 02:59:29 +0000 | |
|---|---|---|
| committer | 2024-06-14 02:59:29 +0000 | |
| commit | 1b0d92919d7924a64732e9a08f7ea6acf3b5aec1 (patch) | |
| tree | 90f47d14983a1dc0ade620c18a577f5d2fd0301b /rust/bindgen.go | |
| parent | 000fe5ac5dca4637a11ee0238ee9a748fb609333 (diff) | |
| parent | e96c16a806053d7db9b1de164f7dba8e499e4a44 (diff) | |
Merge "Make the cflags property configurable" into main
Diffstat (limited to 'rust/bindgen.go')
| -rw-r--r-- | rust/bindgen.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/rust/bindgen.go b/rust/bindgen.go index 427775351..83a6e9590 100644 --- a/rust/bindgen.go +++ b/rust/bindgen.go @@ -236,7 +236,8 @@ func (b *bindgenDecorator) GenerateSource(ctx ModuleContext, deps PathDeps) andr esc := proptools.NinjaAndShellEscapeList // Filter out invalid cflags - for _, flag := range b.ClangProperties.Cflags { + cflagsProp := b.ClangProperties.Cflags.GetOrDefault(ctx, nil) + for _, flag := range cflagsProp { if flag == "-x c++" || flag == "-xc++" { ctx.PropertyErrorf("cflags", "-x c++ should not be specified in cflags; setting cpp_std specifies this is a C++ header, or change the file extension to '.hpp' or '.hh'") @@ -248,7 +249,7 @@ func (b *bindgenDecorator) GenerateSource(ctx ModuleContext, deps PathDeps) andr } // Module defined clang flags and include paths - cflags = append(cflags, esc(b.ClangProperties.Cflags)...) + cflags = append(cflags, esc(cflagsProp)...) for _, include := range b.ClangProperties.Local_include_dirs { cflags = append(cflags, "-I"+android.PathForModuleSrc(ctx, include).String()) implicits = append(implicits, android.PathForModuleSrc(ctx, include)) |