Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 891e7764 authored by Paul Duffin's avatar Paul Duffin Committed by Automerger Merge Worker
Browse files

Remove unnecessary methods/fields of DefaultsModule/Base am: 3f98d148 

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

Change-Id: Ib44fe28b451daa19ef9b7fec83fc549924ba5024
parents f2dc4116 3f98d148

android/defaults.go

+2 −21
Original line number Diff line number Diff line
@@ -115,11 +115,6 @@ type DefaultsVisibilityProperties struct { 


type DefaultsModuleBase struct {

	DefaultableModuleBase



	// Container for defaults of the common properties

	commonProperties commonProperties



	defaultsVisibilityProperties DefaultsVisibilityProperties

}



// The common pattern for defaults modules is to register separate instances of
@@ -153,12 +148,6 @@ type Defaults interface { 
	properties() []interface{}



	productVariableProperties() interface{}



	// Return the defaults common properties.

	common() *commonProperties



	// Return the defaults visibility properties.

	defaultsVisibility() *DefaultsVisibilityProperties

}



func (d *DefaultsModuleBase) isDefaults() bool {
@@ -178,19 +167,11 @@ func (d *DefaultsModuleBase) productVariableProperties() interface{} { 
	return d.defaultableVariableProperties

}



func (d *DefaultsModuleBase) common() *commonProperties {

	return &d.commonProperties

}



func (d *DefaultsModuleBase) defaultsVisibility() *DefaultsVisibilityProperties {

	return &d.defaultsVisibilityProperties

}



func (d *DefaultsModuleBase) GenerateAndroidBuildActions(ctx ModuleContext) {

}



func InitDefaultsModule(module DefaultsModule) {

	commonProperties := module.common()

	commonProperties := &commonProperties{}



	module.AddProperties(

		&hostAndDeviceProperties{},
@@ -205,7 +186,7 @@ func InitDefaultsModule(module DefaultsModule) { 


	// Add properties that will not have defaults applied to them.

	base := module.base()

	defaultsVisibility := module.defaultsVisibility()

	defaultsVisibility := &DefaultsVisibilityProperties{}

	module.AddProperties(&base.nameProperties, defaultsVisibility)



	// Unlike non-defaults modules the visibility property is not stored in m.base().commonProperties.