StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove GLOBAL_THINLTO build option" into main

Browse Source
This commit is contained in:
Yi Kong
2023-10-10 01:41:56 +00:00
committed by Gerrit Code Review
parent 008f2e55c7 950c17435d
commit cdd6a47bbf
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cc/lto.go
View File

@@ -68,7 +68,7 @@ func (lto *lto) props() []interface{} {
func (lto *lto) begin(ctx BaseModuleContext) { func (lto *lto) begin(ctx BaseModuleContext) {
// First, determine the module independent default LTO mode. // First, determine the module independent default LTO mode.
ltoDefault := GlobalThinLTO(ctx) ltoDefault := true
if ctx.Config().IsEnvTrue("DISABLE_LTO") { if ctx.Config().IsEnvTrue("DISABLE_LTO") {
ltoDefault = false ltoDefault = false
} else if lto.Never() { } else if lto.Never() {
@@ -163,10 +163,6 @@ func (lto *lto) Never() bool {
return lto != nil && proptools.Bool(lto.Properties.Lto.Never) 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 // Propagate lto requirements down from binaries
func ltoDepsMutator(mctx android.TopDownMutatorContext) { func ltoDepsMutator(mctx android.TopDownMutatorContext) {
if m, ok := mctx.Module().(*Module); ok { if m, ok := mctx.Module().(*Module); ok {
@@ -205,8 +201,6 @@ func ltoDepsMutator(mctx android.TopDownMutatorContext) {
// Create lto variants for modules that need them // Create lto variants for modules that need them
func ltoMutator(mctx android.BottomUpMutatorContext) { func ltoMutator(mctx android.BottomUpMutatorContext) {
globalThinLTO := GlobalThinLTO(mctx)
if m, ok := mctx.Module().(*Module); ok && m.lto != nil { if m, ok := mctx.Module().(*Module); ok && m.lto != nil {
// Create variations for LTO types required as static // Create variations for LTO types required as static
// dependencies // dependencies
@@ -218,10 +212,10 @@ func ltoMutator(mctx android.BottomUpMutatorContext) {
variationNames = append(variationNames, "lto-none") variationNames = append(variationNames, "lto-none")
} }
if globalThinLTO && !m.lto.Properties.LtoEnabled { if !m.lto.Properties.LtoEnabled {
mctx.SetDependencyVariation("lto-none") mctx.SetDependencyVariation("lto-none")
} }
if !globalThinLTO && m.lto.Properties.LtoEnabled { if m.lto.Properties.LtoEnabled {
mctx.SetDependencyVariation("lto-thin") mctx.SetDependencyVariation("lto-thin")
} }