StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 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
parent 695755ae8c f43ff059ff
commit f1a406cdd6
1 changed files with 5 additions and 5 deletions
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 // Can be called with a null receiver
func (lto *lto) LTO() bool { func (lto *lto) LTO() bool {
if lto == nil || lto.Disabled() { if lto == nil || lto.Never() {
return false return false
} }
@@ -146,7 +146,7 @@ func (lto *lto) FullLTO() bool {
func (lto *lto) ThinLTO() bool { func (lto *lto) ThinLTO() bool {
if Bool(lto.Properties.GlobalThin) { if Bool(lto.Properties.GlobalThin) {
if !lto.Disabled() && !lto.FullLTO() { if !lto.Never() && !lto.FullLTO() {
return true return true
} }
} }
@@ -155,8 +155,8 @@ func (lto *lto) ThinLTO() bool {
} }
// Is lto.never explicitly set to true? // Is lto.never explicitly set to true?
func (lto *lto) Disabled() bool { func (lto *lto) Never() bool {
return lto.Properties.Lto.Never != nil && *lto.Properties.Lto.Never return Bool(lto.Properties.Lto.Never)
} }
// Propagate lto requirements down from binaries // Propagate lto requirements down from binaries
@@ -184,7 +184,7 @@ func ltoDepsMutator(mctx android.TopDownMutatorContext) {
} }
if dep, ok := dep.(*Module); ok && dep.lto != nil && if dep, ok := dep.(*Module); ok && dep.lto != nil &&
!dep.lto.Disabled() { !dep.lto.Never() {
if full && !dep.lto.FullLTO() { if full && !dep.lto.FullLTO() {
dep.lto.Properties.FullDep = true dep.lto.Properties.FullDep = true
} }