diff options
| author | 2020-08-31 10:06:16 +0200 | |
|---|---|---|
| committer | 2020-08-31 10:06:16 +0200 | |
| commit | 682c9d7b2538f8f7f2185296b91abf04835912fc (patch) | |
| tree | 4fc8ba61e8a12ad3c4098426831e2df396b67d30 /rust/bindgen.go | |
| parent | 416149e09b30e80e0599c1b9b482605704ac29c3 (diff) | |
Rename ccConfig to cc_config
Follow up from aosp/1413495 to set a consistent name throughout the
package.
Test: m
Change-Id: Idafcd973e7d874cd97599ac419c2972a8a5cd0b4
Diffstat (limited to 'rust/bindgen.go')
| -rw-r--r-- | rust/bindgen.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/rust/bindgen.go b/rust/bindgen.go index 3f7a6ce3d..03363085b 100644 --- a/rust/bindgen.go +++ b/rust/bindgen.go @@ -33,9 +33,9 @@ var ( //TODO(b/160803703) Use a prebuilt bindgen instead of the built bindgen. _ = pctx.SourcePathVariable("bindgenCmd", "out/host/${config.HostPrebuiltTag}/bin/bindgen") _ = pctx.SourcePathVariable("bindgenClang", - "${ccConfig.ClangBase}/${config.HostPrebuiltTag}/"+bindgenClangVersion+"/bin/clang") + "${cc_config.ClangBase}/${config.HostPrebuiltTag}/"+bindgenClangVersion+"/bin/clang") _ = pctx.SourcePathVariable("bindgenLibClang", - "${ccConfig.ClangBase}/${config.HostPrebuiltTag}/"+bindgenClangVersion+"/lib64/libclang.so."+bindgenLibClangSoGit) + "${cc_config.ClangBase}/${config.HostPrebuiltTag}/"+bindgenClangVersion+"/lib64/libclang.so."+bindgenLibClangSoGit) //TODO(ivanlozano) Switch this to RuleBuilder bindgen = pctx.AndroidStaticRule("bindgen", @@ -101,14 +101,14 @@ func (b *bindgenDecorator) GenerateSource(ctx ModuleContext, deps PathDeps) andr implicits = append(implicits, deps.depSystemIncludePaths...) // Default clang flags - cflags = append(cflags, "${ccConfig.CommonClangGlobalCflags}") + cflags = append(cflags, "${cc_config.CommonClangGlobalCflags}") if ctx.Device() { - cflags = append(cflags, "${ccConfig.DeviceClangGlobalCflags}") + cflags = append(cflags, "${cc_config.DeviceClangGlobalCflags}") } // Toolchain clang flags cflags = append(cflags, "-target "+ccToolchain.ClangTriple()) - cflags = append(cflags, strings.ReplaceAll(ccToolchain.ToolchainClangCflags(), "${config.", "${ccConfig.")) + cflags = append(cflags, strings.ReplaceAll(ccToolchain.ToolchainClangCflags(), "${config.", "${cc_config.")) // Dependency clang flags and include paths cflags = append(cflags, deps.depClangFlags...) |