Add GenerateAndroidBuildActions to DefaultsModuleBase

Add an empty GenerateAndroidBuildActiosn to DefaultsModuleBase
so that every defaults module doesn't need to provide one.  This
will also allow adding an implementation in the next patch.

Test: m checkbuild
Change-Id: I13554bdb3a287c2f18e1efab74d4f08a1ba8620c
This commit is contained in:
Colin Cross 2019-06-10 13:12:56 -07:00
parent b6fd6f75f2
commit 59037628f4
7 changed files with 3 additions and 18 deletions

View File

@ -80,6 +80,9 @@ func (d *DefaultsModuleBase) properties() []interface{} {
return d.defaultableProperties return d.defaultableProperties
} }
func (d *DefaultsModuleBase) GenerateAndroidBuildActions(ctx ModuleContext) {
}
func InitDefaultsModule(module DefaultableModule) { func InitDefaultsModule(module DefaultableModule) {
module.AddProperties( module.AddProperties(
&hostAndDeviceProperties{}, &hostAndDeviceProperties{},

View File

@ -759,6 +759,3 @@ func defaultsFactory() Module {
InitDefaultsModule(m) InitDefaultsModule(m)
return m return m
} }
func (*mockDefaults) GenerateAndroidBuildActions(ctx ModuleContext) {
}

View File

@ -1295,9 +1295,6 @@ type Defaults struct {
android.DefaultsModuleBase android.DefaultsModuleBase
} }
func (*Defaults) GenerateAndroidBuildActions(ctx android.ModuleContext) {
}
func defaultsFactory() android.Module { func defaultsFactory() android.Module {
return DefaultsFactory() return DefaultsFactory()
} }

View File

@ -2036,9 +2036,6 @@ type Defaults struct {
android.ApexModuleBase android.ApexModuleBase
} }
func (*Defaults) GenerateAndroidBuildActions(ctx android.ModuleContext) {
}
// cc_defaults provides a set of properties that can be inherited by other cc // cc_defaults provides a set of properties that can be inherited by other cc
// modules. A module can use the properties from a cc_defaults using // modules. A module can use the properties from a cc_defaults using
// `defaults: ["<:default_module_name>"]`. Properties of both modules are // `defaults: ["<:default_module_name>"]`. Properties of both modules are

View File

@ -582,9 +582,6 @@ type Defaults struct {
android.DefaultsModuleBase android.DefaultsModuleBase
} }
func (*Defaults) GenerateAndroidBuildActions(ctx android.ModuleContext) {
}
func defaultsFactory() android.Module { func defaultsFactory() android.Module {
return DefaultsFactory() return DefaultsFactory()
} }

View File

@ -1808,9 +1808,6 @@ type DocDefaults struct {
android.DefaultsModuleBase android.DefaultsModuleBase
} }
func (*DocDefaults) GenerateAndroidBuildActions(ctx android.ModuleContext) {
}
func DocDefaultsFactory() android.Module { func DocDefaultsFactory() android.Module {
module := &DocDefaults{} module := &DocDefaults{}

View File

@ -2131,9 +2131,6 @@ type Defaults struct {
android.DefaultsModuleBase android.DefaultsModuleBase
} }
func (*Defaults) GenerateAndroidBuildActions(ctx android.ModuleContext) {
}
// java_defaults provides a set of properties that can be inherited by other java or android modules. // java_defaults provides a set of properties that can be inherited by other java or android modules.
// //
// A module can use the properties from a java_defaults module using `defaults: ["defaults_module_name"]`. Each // A module can use the properties from a java_defaults module using `defaults: ["defaults_module_name"]`. Each