openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename ccConfig to cc_config 

Follow up from aosp/1413495 to set a consistent name throughout the
package.

Test: m
Change-Id: Idafcd973e7d874cd97599ac419c2972a8a5cd0b4
This commit is contained in:
Thiébaud Weksteen 2020-08-31 10:06:16 +02:00
parent 416149e09b
commit 682c9d7b25
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rust/bindgen.go
View File

@ -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...)

6
rust/config/global.go
View File

@ -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, " "))

2
rust/config/x86_darwin_host.go
View File

@ -23,7 +23,7 @@ import (
var (
DarwinRustFlags = []string{}
DarwinRustLinkFlags = []string{
"-B${ccConfig.MacToolPath}",
"-B${cc_config.MacToolPath}",
}
darwinX8664Rustflags = []string{}
darwinX8664Linkflags = []string{}

2
rust/config/x86_linux_host.go
View File

@ -23,7 +23,7 @@ import (
var (
LinuxRustFlags = []string{}
LinuxRustLinkFlags = []string{
"-B${ccConfig.ClangBin}",
"-B${cc_config.ClangBin}",
"-fuse-ld=lld",
}
linuxX86Rustflags = []string{}

2
rust/rust.go
View File

@ -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 {