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

Commit 03695729 authored by Colin Cross's avatar Colin Cross Committed by Automerger Merge Worker
Browse files

Merge "Rename ninja variables with Clang in the name" am: 51736b82 am: ac5a348c 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1767413

Change-Id: Ib314260932248c5f2d0ca0f2e567fa61eb91c1e2
parents 7a19faf9 ac5a348c

cc/builder.go

+4 −4
Original line number Diff line number Diff line
@@ -500,10 +500,10 @@ func transformSourceToObj(ctx android.ModuleContext, subdir string, srcFiles and 
		sAbiDumpFiles = make(android.Paths, 0, len(srcFiles))

	}



	cflags += " ${config.NoOverrideClangGlobalCflags}"

	toolingCflags += " ${config.NoOverrideClangGlobalCflags}"

	cppflags += " ${config.NoOverrideClangGlobalCflags}"

	toolingCppflags += " ${config.NoOverrideClangGlobalCflags}"

	cflags += " ${config.NoOverrideGlobalCflags}"

	toolingCflags += " ${config.NoOverrideGlobalCflags}"

	cppflags += " ${config.NoOverrideGlobalCflags}"

	toolingCppflags += " ${config.NoOverrideGlobalCflags}"



	for i, srcFile := range srcFiles {

		objFile := android.ObjPathWithExt(ctx, subdir, srcFile, "o")

cc/cc_test.go

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

cc/compiler.go

+4 −4
Original line number Diff line number Diff line
@@ -438,14 +438,14 @@ func (compiler *baseCompiler) compilerFlags(ctx ModuleContext, flags Flags, deps 
	flags.Global.CppFlags = append([]string{fmt.Sprintf("${config.%sGlobalCppflags}", hod)}, flags.Global.CppFlags...)



	flags.Global.AsFlags = append(flags.Global.AsFlags, tc.Asflags())

	flags.Global.CppFlags = append([]string{"${config.CommonClangGlobalCppflags}"}, flags.Global.CppFlags...)

	flags.Global.CppFlags = append([]string{"${config.CommonGlobalCppflags}"}, flags.Global.CppFlags...)

	flags.Global.CommonFlags = append(flags.Global.CommonFlags,

		tc.Cflags(),

		"${config.CommonClangGlobalCflags}",

		fmt.Sprintf("${config.%sClangGlobalCflags}", hod))

		"${config.CommonGlobalCflags}",

		fmt.Sprintf("${config.%sGlobalCflags}", hod))



	if isThirdParty(modulePath) {

		flags.Global.CommonFlags = append(flags.Global.CommonFlags, "${config.ClangExternalCflags}")

		flags.Global.CommonFlags = append(flags.Global.CommonFlags, "${config.ExternalCflags}")

	}



	if tc.Bionic() {

cc/config/arm64_device.go

+27 −27
Original line number Diff line number Diff line
@@ -99,50 +99,50 @@ func init() { 
	pctx.StaticVariable("Arm64Ldflags", strings.Join(arm64Ldflags, " "))

	pctx.StaticVariable("Arm64Lldflags", strings.Join(arm64Lldflags, " "))



	pctx.StaticVariable("Arm64ClangCflags", strings.Join(arm64Cflags, " "))

	pctx.StaticVariable("Arm64ClangCppflags", strings.Join(arm64Cppflags, " "))

	pctx.StaticVariable("Arm64Cflags", strings.Join(arm64Cflags, " "))

	pctx.StaticVariable("Arm64Cppflags", strings.Join(arm64Cppflags, " "))



	pctx.StaticVariable("Arm64ClangArmv8ACflags", strings.Join(arm64ArchVariantCflags["armv8-a"], " "))

	pctx.StaticVariable("Arm64ClangArmv8ABranchProtCflags", strings.Join(arm64ArchVariantCflags["armv8-a-branchprot"], " "))

	pctx.StaticVariable("Arm64ClangArmv82ACflags", strings.Join(arm64ArchVariantCflags["armv8-2a"], " "))

	pctx.StaticVariable("Arm64ClangArmv82ADotprodCflags", strings.Join(arm64ArchVariantCflags["armv8-2a-dotprod"], " "))

	pctx.StaticVariable("Arm64Armv8ACflags", strings.Join(arm64ArchVariantCflags["armv8-a"], " "))

	pctx.StaticVariable("Arm64Armv8ABranchProtCflags", strings.Join(arm64ArchVariantCflags["armv8-a-branchprot"], " "))

	pctx.StaticVariable("Arm64Armv82ACflags", strings.Join(arm64ArchVariantCflags["armv8-2a"], " "))

	pctx.StaticVariable("Arm64Armv82ADotprodCflags", strings.Join(arm64ArchVariantCflags["armv8-2a-dotprod"], " "))



	pctx.StaticVariable("Arm64ClangCortexA53Cflags",

	pctx.StaticVariable("Arm64CortexA53Cflags",

		strings.Join(arm64CpuVariantCflags["cortex-a53"], " "))



	pctx.StaticVariable("Arm64ClangCortexA55Cflags",

	pctx.StaticVariable("Arm64CortexA55Cflags",

		strings.Join(arm64CpuVariantCflags["cortex-a55"], " "))



	pctx.StaticVariable("Arm64ClangKryoCflags",

	pctx.StaticVariable("Arm64KryoCflags",

		strings.Join(arm64CpuVariantCflags["kryo"], " "))



	pctx.StaticVariable("Arm64ClangExynosM1Cflags",

	pctx.StaticVariable("Arm64ExynosM1Cflags",

		strings.Join(arm64CpuVariantCflags["exynos-m1"], " "))



	pctx.StaticVariable("Arm64ClangExynosM2Cflags",

	pctx.StaticVariable("Arm64ExynosM2Cflags",

		strings.Join(arm64CpuVariantCflags["exynos-m2"], " "))

}



var (

	arm64ArchVariantCflagsVar = map[string]string{

		"armv8-a":            "${config.Arm64ClangArmv8ACflags}",

		"armv8-a-branchprot": "${config.Arm64ClangArmv8ABranchProtCflags}",

		"armv8-2a":           "${config.Arm64ClangArmv82ACflags}",

		"armv8-2a-dotprod":   "${config.Arm64ClangArmv82ADotprodCflags}",

		"armv8-a":            "${config.Arm64Armv8ACflags}",

		"armv8-a-branchprot": "${config.Arm64Armv8ABranchProtCflags}",

		"armv8-2a":           "${config.Arm64Armv82ACflags}",

		"armv8-2a-dotprod":   "${config.Arm64Armv82ADotprodCflags}",

	}



	arm64CpuVariantCflagsVar = map[string]string{

		"":           "",

		"cortex-a53": "${config.Arm64ClangCortexA53Cflags}",

		"cortex-a55": "${config.Arm64ClangCortexA55Cflags}",

		"cortex-a72": "${config.Arm64ClangCortexA53Cflags}",

		"cortex-a73": "${config.Arm64ClangCortexA53Cflags}",

		"cortex-a75": "${config.Arm64ClangCortexA55Cflags}",

		"cortex-a76": "${config.Arm64ClangCortexA55Cflags}",

		"kryo":       "${config.Arm64ClangKryoCflags}",

		"kryo385":    "${config.Arm64ClangCortexA53Cflags}",

		"exynos-m1":  "${config.Arm64ClangExynosM1Cflags}",

		"exynos-m2":  "${config.Arm64ClangExynosM2Cflags}",

		"cortex-a53": "${config.Arm64CortexA53Cflags}",

		"cortex-a55": "${config.Arm64CortexA55Cflags}",

		"cortex-a72": "${config.Arm64CortexA53Cflags}",

		"cortex-a73": "${config.Arm64CortexA53Cflags}",

		"cortex-a75": "${config.Arm64CortexA55Cflags}",

		"cortex-a76": "${config.Arm64CortexA55Cflags}",

		"kryo":       "${config.Arm64KryoCflags}",

		"kryo385":    "${config.Arm64CortexA53Cflags}",

		"exynos-m1":  "${config.Arm64ExynosM1Cflags}",

		"exynos-m2":  "${config.Arm64ExynosM2Cflags}",

	}

)
@@ -180,11 +180,11 @@ func (t *toolchainArm64) ClangTriple() string { 
}



func (t *toolchainArm64) Cflags() string {

	return "${config.Arm64ClangCflags}"

	return "${config.Arm64Cflags}"

}



func (t *toolchainArm64) Cppflags() string {

	return "${config.Arm64ClangCppflags}"

	return "${config.Arm64Cppflags}"

}



func (t *toolchainArm64) Ldflags() string {

cc/config/arm64_linux_host.go

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ func (toolchainLinuxArm64) ClangTriple() string { 


func (toolchainLinuxArm64) Cflags() string {

	// The inherited flags + extra flags

	return "${config.Arm64ClangCflags} ${config.LinuxBionicArm64Cflags}"

	return "${config.Arm64Cflags} ${config.LinuxBionicArm64Cflags}"

}



func (toolchainLinuxArm64) CrtBeginSharedBinary() []string {