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
This commit is contained in:
Colin Cross
2021-07-14 18:45:05 -07:00
parent c8bed31f56
commit 0523ba2675
18 changed files with 163 additions and 164 deletions

View File

@@ -4038,14 +4038,14 @@ func TestIncludeDirectoryOrdering(t *testing.T) {
}
want := []string{
"${config.ArmClangThumbCflags}",
"${config.ArmClangCflags}",
"${config.CommonClangGlobalCflags}",
"${config.DeviceClangGlobalCflags}",
"${config.ClangExternalCflags}",
"${config.ArmToolchainClangCflags}",
"${config.ArmClangArmv7ANeonCflags}",
"${config.ArmClangGenericCflags}",
"${config.ArmThumbCflags}",
"${config.ArmCflags}",
"${config.CommonGlobalCflags}",
"${config.DeviceGlobalCflags}",
"${config.ExternalCflags}",
"${config.ArmToolchainCflags}",
"${config.ArmArmv7ANeonCflags}",
"${config.ArmGenericCflags}",
"android_arm_export_include_dirs",
"lib32_export_include_dirs",
"arm_export_include_dirs",
@@ -4076,7 +4076,7 @@ func TestIncludeDirectoryOrdering(t *testing.T) {
"defaults/cc/common/ndk_libandroid_support",
"out/soong/ndk/sysroot/usr/include",
"out/soong/ndk/sysroot/usr/include/arm-linux-androideabi",
"${config.NoOverrideClangGlobalCflags}",
"${config.NoOverrideGlobalCflags}",
}
android.AssertArrayString(t, "includes", want, includes)