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

Commit f825d2e1 authored by Yi Kong's avatar Yi Kong Committed by Automerger Merge Worker
Browse files

Merge "Remove GLOBAL_THINLTO build option" into main am: cdd6a47b am: b61a2851 

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



Change-Id: I8951f7a359dbf2614fa85718ad3c55e6c7a45072
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1647fcd4 b61a2851

cc/lto.go

+3 −9
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ func (lto *lto) props() []interface{} { 


func (lto *lto) begin(ctx BaseModuleContext) {

	// First, determine the module independent default LTO mode.

	ltoDefault := GlobalThinLTO(ctx)

	ltoDefault := true

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

		ltoDefault = false

	} else if lto.Never() {
@@ -163,10 +163,6 @@ func (lto *lto) Never() bool { 
	return lto != nil && proptools.Bool(lto.Properties.Lto.Never)

}



func GlobalThinLTO(ctx android.BaseModuleContext) bool {

	return !ctx.Config().IsEnvFalse("GLOBAL_THINLTO")

}



// Propagate lto requirements down from binaries

func ltoDepsMutator(mctx android.TopDownMutatorContext) {

	if m, ok := mctx.Module().(*Module); ok {
@@ -205,8 +201,6 @@ func ltoDepsMutator(mctx android.TopDownMutatorContext) { 


// Create lto variants for modules that need them

func ltoMutator(mctx android.BottomUpMutatorContext) {

	globalThinLTO := GlobalThinLTO(mctx)



	if m, ok := mctx.Module().(*Module); ok && m.lto != nil {

		// Create variations for LTO types required as static

		// dependencies
@@ -218,10 +212,10 @@ func ltoMutator(mctx android.BottomUpMutatorContext) { 
			variationNames = append(variationNames, "lto-none")

		}



		if globalThinLTO && !m.lto.Properties.LtoEnabled {

		if !m.lto.Properties.LtoEnabled {

			mctx.SetDependencyVariation("lto-none")

		}

		if !globalThinLTO && m.lto.Properties.LtoEnabled {

		if m.lto.Properties.LtoEnabled {

			mctx.SetDependencyVariation("lto-thin")

		}