Rename ccConfig to cc_config
Follow up from aosp/1413495 to set a consistent name throughout the
package.
Test: m
Change-Id: Idafcd973e7d874cd97599ac419c2972a8a5cd0b4
diff --git a/rust/config/global.go b/rust/config/global.go
index 88d4139..2f4d930 100644
--- a/rust/config/global.go
+++ b/rust/config/global.go
@@ -56,7 +56,7 @@
"-Wl,--no-undefined",
"-Wl,--hash-style=gnu",
- "-B${ccConfig.ClangBin}",
+ "-B${cc_config.ClangBin}",
"-fuse-ld=lld",
}
)
@@ -82,8 +82,8 @@
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 4104400..a13a9a6 100644
--- a/rust/config/x86_darwin_host.go
+++ b/rust/config/x86_darwin_host.go
@@ -23,7 +23,7 @@
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 acc99e1..b55b2f2 100644
--- a/rust/config/x86_linux_host.go
+++ b/rust/config/x86_linux_host.go
@@ -23,7 +23,7 @@
var (
LinuxRustFlags = []string{}
LinuxRustLinkFlags = []string{
- "-B${ccConfig.ClangBin}",
+ "-B${cc_config.ClangBin}",
"-fuse-ld=lld",
}
linuxX86Rustflags = []string{}