diff options
| -rw-r--r-- | rust/bindgen.go | 10 | ||||
| -rw-r--r-- | rust/config/global.go | 6 | ||||
| -rw-r--r-- | rust/config/x86_darwin_host.go | 2 | ||||
| -rw-r--r-- | rust/config/x86_linux_host.go | 2 | ||||
| -rw-r--r-- | rust/rust.go | 2 |
5 files changed, 11 insertions, 11 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...) diff --git a/rust/config/global.go b/rust/config/global.go index 88d4139d9..2f4d930e7 100644 --- a/rust/config/global.go +++ b/rust/config/global.go @@ -56,7 +56,7 @@ var ( "-Wl,--no-undefined", "-Wl,--hash-style=gnu", - "-B${ccConfig.ClangBin}", + "-B${cc_config.ClangBin}", "-fuse-ld=lld", } ) @@ -82,8 +82,8 @@ func init() { pctx.StaticVariable("RustPath", "${RustBase}/${HostPrebuiltTag}/${RustVersion}") pctx.StaticVariable("RustBin", "${RustPath}/bin") - pctx.ImportAs("ccConfig", "android/soong/cc/config") - pctx.StaticVariable("RustLinker", "${ccConfig.ClangBin}/clang++") + pctx.ImportAs("cc_config", "android/soong/cc/config") + pctx.StaticVariable("RustLinker", "${cc_config.ClangBin}/clang++") pctx.StaticVariable("RustLinkerArgs", "") pctx.StaticVariable("DeviceGlobalLinkFlags", strings.Join(deviceGlobalLinkFlags, " ")) diff --git a/rust/config/x86_darwin_host.go b/rust/config/x86_darwin_host.go index 4104400c1..a13a9a6a4 100644 --- a/rust/config/x86_darwin_host.go +++ b/rust/config/x86_darwin_host.go @@ -23,7 +23,7 @@ import ( var ( DarwinRustFlags = []string{} DarwinRustLinkFlags = []string{ - "-B${ccConfig.MacToolPath}", + "-B${cc_config.MacToolPath}", } darwinX8664Rustflags = []string{} darwinX8664Linkflags = []string{} diff --git a/rust/config/x86_linux_host.go b/rust/config/x86_linux_host.go index acc99e1c2..b55b2f2a2 100644 --- a/rust/config/x86_linux_host.go +++ b/rust/config/x86_linux_host.go @@ -23,7 +23,7 @@ import ( var ( LinuxRustFlags = []string{} LinuxRustLinkFlags = []string{ - "-B${ccConfig.ClangBin}", + "-B${cc_config.ClangBin}", "-fuse-ld=lld", } linuxX86Rustflags = []string{} diff --git a/rust/rust.go b/rust/rust.go index 84728df88..5c6cdb792 100644 --- a/rust/rust.go +++ b/rust/rust.go @@ -43,7 +43,7 @@ func init() { ctx.BottomUp("rust_begin", BeginMutator).Parallel() }) pctx.Import("android/soong/rust/config") - pctx.ImportAs("ccConfig", "android/soong/cc/config") + pctx.ImportAs("cc_config", "android/soong/cc/config") } type Flags struct { |