tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "lto: Rename Disabled to Never to reduce confusion"

Browse source
This commit is contained in:
Treehugger Robot 2020-09-28 21:47:16 +00:00 committed by Gerrit Code Review
commit f1a406cdd6
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cc/lto.go
View file

@ -133,7 +133,7 @@ func (lto *lto) flags(ctx BaseModuleContext, flags Flags) Flags {
// Can be called with a null receiver
func (lto *lto) LTO() bool {
if lto == nil || lto.Disabled() {
if lto == nil || lto.Never() {
return false
}
@ -146,7 +146,7 @@ func (lto *lto) FullLTO() bool {
func (lto *lto) ThinLTO() bool {
if Bool(lto.Properties.GlobalThin) {
if !lto.Disabled() && !lto.FullLTO() {
if !lto.Never() && !lto.FullLTO() {
return true
}
}
@ -155,8 +155,8 @@ func (lto *lto) ThinLTO() bool {
}
// Is lto.never explicitly set to true?
func (lto *lto) Disabled() bool {
return lto.Properties.Lto.Never != nil && *lto.Properties.Lto.Never
func (lto *lto) Never() bool {
return Bool(lto.Properties.Lto.Never)
}
// Propagate lto requirements down from binaries
@ -184,7 +184,7 @@ func ltoDepsMutator(mctx android.TopDownMutatorContext) {
}
if dep, ok := dep.(*Module); ok && dep.lto != nil &&
!dep.lto.Disabled() {
!dep.lto.Never() {
if full && !dep.lto.FullLTO() {
dep.lto.Properties.FullDep = true
}