Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 682c9d7b authored by Thiébaud Weksteen's avatar Thiébaud Weksteen
Browse files

Rename ccConfig to cc_config 

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

Test: m
Change-Id: Idafcd973e7d874cd97599ac419c2972a8a5cd0b4
parent 416149e0

rust/bindgen.go

+5 −5
Original line number Diff line number Diff line
@@ -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...)

rust/config/global.go

+3 −3
Original line number Diff line number Diff line
@@ -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, " "))

rust/config/x86_darwin_host.go

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ import ( 
var (

	DarwinRustFlags     = []string{}

	DarwinRustLinkFlags = []string{

		"-B${ccConfig.MacToolPath}",

		"-B${cc_config.MacToolPath}",

	}

	darwinX8664Rustflags = []string{}

	darwinX8664Linkflags = []string{}

rust/config/x86_linux_host.go

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ import ( 
var (

	LinuxRustFlags     = []string{}

	LinuxRustLinkFlags = []string{

		"-B${ccConfig.ClangBin}",

		"-B${cc_config.ClangBin}",

		"-fuse-ld=lld",

	}

	linuxX86Rustflags   = []string{}

rust/rust.go

+1 −1
Original line number Diff line number Diff line
@@ -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 {