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

Merge "Add prebuilt_defaults for prebuilt etc modules" am: d91c75ca09

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

Change-Id: Icf6552fe42f1427feabab0562c530fe64a7756ae
This commit is contained in:
Inseob Kim
2021-05-07 00:29:10 +00:00
committed by Automerger Merge Worker
parent c24869d391 d91c75ca09
commit 837b94419f
1 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
etc/prebuilt_etc.go
View File

@@ -55,6 +55,8 @@ func RegisterPrebuiltEtcBuildComponents(ctx android.RegistrationContext) {
ctx.RegisterModuleType("prebuilt_firmware", PrebuiltFirmwareFactory) ctx.RegisterModuleType("prebuilt_firmware", PrebuiltFirmwareFactory)
ctx.RegisterModuleType("prebuilt_dsp", PrebuiltDSPFactory) ctx.RegisterModuleType("prebuilt_dsp", PrebuiltDSPFactory)
ctx.RegisterModuleType("prebuilt_rfsa", PrebuiltRFSAFactory) ctx.RegisterModuleType("prebuilt_rfsa", PrebuiltRFSAFactory)
ctx.RegisterModuleType("prebuilt_defaults", defaultsFactory)
} }
var PrepareForTestWithPrebuiltEtc = android.FixtureRegisterWithContext(RegisterPrebuiltEtcBuildComponents) var PrepareForTestWithPrebuiltEtc = android.FixtureRegisterWithContext(RegisterPrebuiltEtcBuildComponents)
@@ -124,6 +126,7 @@ type PrebuiltEtcModule interface {
type PrebuiltEtc struct { type PrebuiltEtc struct {
android.ModuleBase android.ModuleBase
android.DefaultableModuleBase
properties prebuiltEtcProperties properties prebuiltEtcProperties
subdirProperties prebuiltSubdirProperties subdirProperties prebuiltSubdirProperties
@@ -139,6 +142,11 @@ type PrebuiltEtc struct {
additionalDependencies *android.Paths additionalDependencies *android.Paths
} }
type Defaults struct {
android.ModuleBase
android.DefaultsModuleBase
}
func (p *PrebuiltEtc) inRamdisk() bool { func (p *PrebuiltEtc) inRamdisk() bool {
return p.ModuleBase.InRamdisk() || p.ModuleBase.InstallInRamdisk() return p.ModuleBase.InRamdisk() || p.ModuleBase.InstallInRamdisk()
} }
@@ -378,6 +386,25 @@ func PrebuiltEtcFactory() android.Module {
InitPrebuiltEtcModule(module, "etc") InitPrebuiltEtcModule(module, "etc")
// This module is device-only // This module is device-only
android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibFirst) android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibFirst)
android.InitDefaultableModule(module)
return module
}
func defaultsFactory() android.Module {
return DefaultsFactory()
}
func DefaultsFactory(props ...interface{}) android.Module {
module := &Defaults{}
module.AddProperties(props...)
module.AddProperties(
&prebuiltEtcProperties{},
&prebuiltSubdirProperties{},
)
android.InitDefaultsModule(module)
return module return module
} }