Merge "Disable() must not be enabled unexpectedly" (6aed6a38) · Commits · e / os / android_build_soong

android/module.go

+7 −1

Original line number	Diff line number	Diff line
		@@ -548,6 +548,9 @@ type commonProperties struct {

		SkipInstall bool `blueprint:"mutated"`

		// Disabled by mutators. If set to true, it overrides Enabled property.
		ForcedDisabled bool `blueprint:"mutated"`

		NamespaceExportedToMake bool `blueprint:"mutated"`

		MissingDeps []string `blueprint:"mutated"`
		@@ -1022,6 +1025,9 @@ func (m *ModuleBase) PartitionTag(config DeviceConfig) string {
		}

		func (m *ModuleBase) Enabled() bool {
		if m.commonProperties.ForcedDisabled {
		return false
		}
		if m.commonProperties.Enabled == nil {
		return !m.Os().DefaultDisabled
		}
		@@ -1029,7 +1035,7 @@ func (m *ModuleBase) Enabled() bool {
		}

		func (m *ModuleBase) Disable() {
		m.commonProperties.Enabled = proptools.BoolPtr(false)
		m.commonProperties.ForcedDisabled = true
		}

		func (m *ModuleBase) SkipInstall() {