Rename ninja variables with Clang in the name
Rename the ninja variables that have an extraneous Clang in the name,
since there are no longer any non-Clang variables.
Bug: 68947919
Test: no change to command lines used to build mmma bionic
Change-Id: I081d5e1d423a66d55faece6cb1d265cd5e504d5f
diff --git a/cc/config/x86_64_device.go b/cc/config/x86_64_device.go
index ec8bab2..c4f47a7 100644
--- a/cc/config/x86_64_device.go
+++ b/cc/config/x86_64_device.go
@@ -103,8 +103,8 @@
pctx.StaticVariable("X86_64Lldflags", strings.Join(x86_64Ldflags, " "))
// Clang cflags
- pctx.StaticVariable("X86_64ClangCflags", strings.Join(x86_64Cflags, " "))
- pctx.StaticVariable("X86_64ClangCppflags", strings.Join(x86_64Cppflags, " "))
+ pctx.StaticVariable("X86_64Cflags", strings.Join(x86_64Cflags, " "))
+ pctx.StaticVariable("X86_64Cppflags", strings.Join(x86_64Cppflags, " "))
// Yasm flags
pctx.StaticVariable("X86_64YasmFlags", "-f elf64 -m amd64")
@@ -113,7 +113,7 @@
// Architecture variant cflags
for variant, cflags := range x86_64ArchVariantCflags {
- pctx.StaticVariable("X86_64"+variant+"VariantClangCflags",
+ pctx.StaticVariable("X86_64"+variant+"VariantCflags",
strings.Join(cflags, " "))
}
}
@@ -157,11 +157,11 @@
}
func (t *toolchainX86_64) Cflags() string {
- return "${config.X86_64ClangCflags}"
+ return "${config.X86_64Cflags}"
}
func (t *toolchainX86_64) Cppflags() string {
- return "${config.X86_64ClangCppflags}"
+ return "${config.X86_64Cppflags}"
}
func (t *toolchainX86_64) Ldflags() string {
@@ -183,7 +183,7 @@
func x86_64ToolchainFactory(arch android.Arch) Toolchain {
toolchainCflags := []string{
"${config.X86_64ToolchainCflags}",
- "${config.X86_64" + arch.ArchVariant + "VariantClangCflags}",
+ "${config.X86_64" + arch.ArchVariant + "VariantCflags}",
}
for _, feature := range arch.ArchFeatures {