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

Commit 66c8b446 authored by Stephen Hines's avatar Stephen Hines
Browse files

Add support for AUTO_*_INITIALIZE to build/soong. 

Bug: http://b/131390872
Test: Builds with/without AUTO_ZERO_INITIALIZE set.
Test: Builds with/without AUTO_PATTERN_INITIALIZE set.

Change-Id: If085ec53c619e2cebc86ca23f7039298160d99ae
parent 7bb2aec1

cc/config/global.go

+16 −2
Original line number Diff line number Diff line
@@ -150,8 +150,22 @@ func init() { 
	pctx.StaticVariable("HostGlobalLdflags", strings.Join(hostGlobalLdflags, " "))

	pctx.StaticVariable("HostGlobalLldflags", strings.Join(hostGlobalLldflags, " "))



	pctx.StaticVariable("CommonClangGlobalCflags",

		strings.Join(append(ClangFilterUnknownCflags(commonGlobalCflags), "${ClangExtraCflags}"), " "))

	pctx.VariableFunc("CommonClangGlobalCflags", func(ctx android.PackageVarContext) string {

		flags := ClangFilterUnknownCflags(commonGlobalCflags)

		flags = append(flags, "${ClangExtraCflags}")



		// http://b/131390872

		// Automatically initialize any uninitialized stack variables.

		// Prefer zero-init if both options are set.

		if ctx.Config().IsEnvTrue("AUTO_ZERO_INITIALIZE") {

			flags = append(flags, "-ftrivial-auto-var-init=zero -enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clang")

		} else if ctx.Config().IsEnvTrue("AUTO_PATTERN_INITIALIZE") {

			flags = append(flags, "-ftrivial-auto-var-init=pattern")

		}



		return strings.Join(flags, " ")

	})



	pctx.VariableFunc("DeviceClangGlobalCflags", func(ctx android.PackageVarContext) string {

		if ctx.Config().Fuchsia() {

			return strings.Join(ClangFilterUnknownCflags(deviceGlobalCflags), " ")