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

Merge "Disable() must not be enabled unexpectedly" am: 6aed6a385e

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

Change-Id: I2872ee13bb99315cf725ea442c400f083e172c12
This commit is contained in:
Treehugger Robot
2020-08-01 09:00:23 +00:00
committed by Automerger Merge Worker
parent e43ca19e7e 6aed6a385e
commit f6b2c3297c
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
android/module.go
View File

@@ -548,6 +548,9 @@ type commonProperties struct {
SkipInstall bool `blueprint:"mutated"` SkipInstall bool `blueprint:"mutated"`
// Disabled by mutators. If set to true, it overrides Enabled property.
ForcedDisabled bool `blueprint:"mutated"`
NamespaceExportedToMake bool `blueprint:"mutated"` NamespaceExportedToMake bool `blueprint:"mutated"`
MissingDeps []string `blueprint:"mutated"` MissingDeps []string `blueprint:"mutated"`
@@ -1022,6 +1025,9 @@ func (m *ModuleBase) PartitionTag(config DeviceConfig) string {
} }
func (m *ModuleBase) Enabled() bool { func (m *ModuleBase) Enabled() bool {
if m.commonProperties.ForcedDisabled {
return false
}
if m.commonProperties.Enabled == nil { if m.commonProperties.Enabled == nil {
return !m.Os().DefaultDisabled return !m.Os().DefaultDisabled
} }
@@ -1029,7 +1035,7 @@ func (m *ModuleBase) Enabled() bool {
} }
func (m *ModuleBase) Disable() { func (m *ModuleBase) Disable() {
m.commonProperties.Enabled = proptools.BoolPtr(false) m.commonProperties.ForcedDisabled = true
} }
func (m *ModuleBase) SkipInstall() { func (m *ModuleBase) SkipInstall() {