tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Stop module types being SdkAware

Browse source 
Removes all usages of SdkBase and InitSdkAwareModule.

Bug: 260237150
Test: m nothing
Change-Id: I07db8afc805eadbeb5b23f2e1d2f51567eecfab0
This commit is contained in:
Paul Duffin 2022-11-23 23:06:05 +00:00
parent 5e71e68a82
commit d796f6f6dc
12 changed files with 2 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/license.go
View file

@ -58,7 +58,6 @@ var _ Bazelable = &licenseModule{}
type licenseModule struct {
ModuleBase
DefaultableModuleBase
SdkBase
BazelModuleBase
properties licenseProperties
@ -137,7 +136,6 @@ func LicenseFactory() Module {
// The visibility property needs to be checked and parsed by the visibility module.
setPrimaryVisibilityProperty(module, "visibility", &module.properties.Visibility)
InitSdkAwareModule(module)
initAndroidModuleBase(module)
InitDefaultableModule(module)
InitBazelModule(module)

2
apex/apex.go
View file

@ -396,7 +396,6 @@ type apexBundle struct {
android.ModuleBase
android.DefaultableModuleBase
android.OverridableModuleBase
android.SdkBase
android.BazelModuleBase
multitree.ExportableModuleBase
@ -2593,7 +2592,6 @@ func newApexBundle() *apexBundle {
android.InitAndroidMultiTargetsArchModule(module, android.HostAndDeviceSupported, android.MultilibCommon)
android.InitDefaultableModule(module)
android.InitSdkAwareModule(module)
android.InitOverridableModule(module, &module.overridableProperties.Overrides)
android.InitBazelModule(module)
multitree.InitExportableModule(module)

2
cc/cc.go
View file

@ -818,7 +818,6 @@ type BazelHandler interface {
type Module struct {
fuzz.FuzzModule
android.SdkBase
android.BazelModuleBase
VendorProperties VendorProperties
@ -1199,7 +1198,6 @@ func (c *Module) Init() android.Module {
android.InitBazelModule(c)
}
android.InitApexModule(c)
android.InitSdkAwareModule(c)
android.InitDefaultableModule(c)
return c

3
cc/prebuilt.go
View file

@ -293,8 +293,6 @@ func NewPrebuiltLibrary(hod android.HostOrDeviceSupported, srcsProperty string)
android.InitPrebuiltModuleWithSrcSupplier(module, srcsSupplier, srcsProperty)
}
// Prebuilt libraries can be used in SDKs.
android.InitSdkAwareModule(module)
return module, library
}
@ -580,7 +578,6 @@ func NewPrebuiltObject(hod android.HostOrDeviceSupported) *Module {
module.linker = prebuilt
module.AddProperties(&prebuilt.properties)
android.InitPrebuiltModule(module, &prebuilt.properties.Srcs)
android.InitSdkAwareModule(module)
return module
}

1
java/base.go
View file

@ -395,7 +395,6 @@ type Module struct {
android.ModuleBase
android.DefaultableModuleBase
android.ApexModuleBase
android.SdkBase
android.BazelModuleBase
// Functionality common to Module and Import.

3
java/bootclasspath_fragment.go
View file

@ -229,7 +229,6 @@ type SourceOnlyBootclasspathProperties struct {
type BootclasspathFragmentModule struct {
android.ModuleBase
android.ApexModuleBase
android.SdkBase
ClasspathFragmentBase
// True if this fragment is for testing purposes.
@ -279,7 +278,6 @@ func bootclasspathFragmentFactory() android.Module {
m := &BootclasspathFragmentModule{}
m.AddProperties(&m.properties, &m.sourceOnlyProperties)
android.InitApexModule(m)
android.InitSdkAwareModule(m)
initClasspathFragment(m, BOOTCLASSPATH)
android.InitAndroidArchModule(m, android.DeviceSupported, android.MultilibCommon)
@ -1353,7 +1351,6 @@ func prebuiltBootclasspathFragmentFactory() android.Module {
// array.
android.InitPrebuiltModule(m, &[]string{"placeholder"})
android.InitApexModule(m)
android.InitSdkAwareModule(m)
android.InitAndroidArchModule(m, android.HostAndDeviceSupported, android.MultilibCommon)
// Initialize the contents property from the image_name.

4
java/droidstubs.go
View file

@ -46,7 +46,6 @@ func RegisterStubsBuildComponents(ctx android.RegistrationContext) {
// Droidstubs
type Droidstubs struct {
Javadoc
android.SdkBase
properties DroidstubsProperties
apiFile android.Path
@ -177,7 +176,6 @@ func DroidstubsFactory() android.Module {
&module.Javadoc.properties)
InitDroiddocModule(module, android.HostAndDeviceSupported)
android.InitSdkAwareModule(module)
return module
}
@ -857,7 +855,6 @@ type PrebuiltStubsSources struct {
android.ModuleBase
android.DefaultableModuleBase
prebuilt android.Prebuilt
android.SdkBase
properties PrebuiltStubsSourcesProperties
@ -937,7 +934,6 @@ func PrebuiltStubsSourcesFactory() android.Module {
module.AddProperties(&module.properties)
android.InitPrebuiltModule(module, &module.properties.Srcs)
android.InitSdkAwareModule(module)
InitDroiddocModule(module, android.HostAndDeviceSupported)
return module
}

6
java/java.go
View file

@ -849,7 +849,6 @@ func LibraryFactory() android.Module {
module.initModuleAndImport(module)
android.InitApexModule(module)
android.InitSdkAwareModule(module)
android.InitBazelModule(module)
InitJavaModule(module, android.HostAndDeviceSupported)
return module
@ -872,7 +871,6 @@ func LibraryHostFactory() android.Module {
module.Module.properties.Installable = proptools.BoolPtr(true)
android.InitApexModule(module)
android.InitSdkAwareModule(module)
android.InitBazelModule(module)
InitJavaModule(module, android.HostSupported)
return module
@ -1295,7 +1293,6 @@ func TestFactory() android.Module {
module.Module.dexpreopter.isTest = true
module.Module.linter.properties.Lint.Test = proptools.BoolPtr(true)
android.InitSdkAwareModule(module)
InitJavaModule(module, android.HostAndDeviceSupported)
return module
}
@ -1334,7 +1331,6 @@ func JavaTestImportFactory() android.Module {
android.InitPrebuiltModule(module, &module.properties.Jars)
android.InitApexModule(module)
android.InitSdkAwareModule(module)
InitJavaModule(module, android.HostAndDeviceSupported)
return module
}
@ -1756,7 +1752,6 @@ type Import struct {
android.ApexModuleBase
android.BazelModuleBase
prebuilt android.Prebuilt
android.SdkBase
// Functionality common to Module and Import.
embeddableInModuleAndImport
@ -2130,7 +2125,6 @@ func ImportFactory() android.Module {
android.InitPrebuiltModule(module, &module.properties.Jars)
android.InitApexModule(module)
android.InitSdkAwareModule(module)
android.InitBazelModule(module)
InitJavaModule(module, android.HostAndDeviceSupported)
return module

7
java/platform_compat_config.go
View file

@ -15,12 +15,11 @@
package java
import (
"fmt"
"path/filepath"
"android/soong/android"
"github.com/google/blueprint"
"fmt"
)
func init() {
@ -55,7 +54,6 @@ type platformCompatConfigProperties struct {
type platformCompatConfig struct {
android.ModuleBase
android.SdkBase
properties platformCompatConfigProperties
installDirPath android.InstallPath
@ -127,7 +125,6 @@ func (p *platformCompatConfig) AndroidMkEntries() []android.AndroidMkEntries {
func PlatformCompatConfigFactory() android.Module {
module := &platformCompatConfig{}
module.AddProperties(&module.properties)
android.InitSdkAwareModule(module)
android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibCommon)
return module
}
@ -178,7 +175,6 @@ var _ android.SdkMemberType = (*compatConfigMemberType)(nil)
// A prebuilt version of the platform compat config module.
type prebuiltCompatConfigModule struct {
android.ModuleBase
android.SdkBase
prebuilt android.Prebuilt
properties prebuiltCompatConfigProperties
@ -213,7 +209,6 @@ func prebuiltCompatConfigFactory() android.Module {
m := &prebuiltCompatConfigModule{}
m.AddProperties(&m.properties)
android.InitSingleSourcePrebuiltModule(m, &m.properties, "Metadata")
android.InitSdkAwareModule(m)
android.InitAndroidArchModule(m, android.DeviceSupported, android.MultilibCommon)
return m
}

5
java/sdk_library.go
View file

@ -752,7 +752,7 @@ type commonToSdkLibraryAndImportProperties struct {
// commonSdkLibraryAndImportModule defines the interface that must be provided by a module that
// embeds the commonToSdkLibraryAndImport struct.
type commonSdkLibraryAndImportModule interface {
android.SdkAware
android.Module
BaseModuleName() string
}
@ -2048,7 +2048,6 @@ func SdkLibraryFactory() android.Module {
module.InitSdkLibraryProperties()
android.InitApexModule(module)
android.InitSdkAwareModule(module)
InitJavaModule(module, android.HostAndDeviceSupported)
// Initialize the map from scope to scope specific properties.
@ -2126,7 +2125,6 @@ type SdkLibraryImport struct {
android.DefaultableModuleBase
prebuilt android.Prebuilt
android.ApexModuleBase
android.SdkBase
hiddenAPI
dexpreopter
@ -2208,7 +2206,6 @@ func sdkLibraryImportFactory() android.Module {
android.InitPrebuiltModule(module, &[]string{""})
android.InitApexModule(module)
android.InitSdkAwareModule(module)
InitJavaModule(module, android.HostAndDeviceSupported)
module.SetDefaultableHook(func(mctx android.DefaultableHookContext) {

3
java/system_modules.go
View file

@ -114,7 +114,6 @@ func SystemModulesFactory() android.Module {
module.AddProperties(&module.properties)
android.InitAndroidArchModule(module, android.HostAndDeviceSupported, android.MultilibCommon)
android.InitDefaultableModule(module)
android.InitSdkAwareModule(module)
return module
}
@ -130,7 +129,6 @@ var _ SystemModulesProvider = (*systemModulesImport)(nil)
type SystemModules struct {
android.ModuleBase
android.DefaultableModuleBase
android.SdkBase
properties SystemModulesProperties
@ -215,7 +213,6 @@ func systemModulesImportFactory() android.Module {
android.InitPrebuiltModule(module, &module.properties.Libs)
android.InitAndroidArchModule(module, android.HostAndDeviceSupported, android.MultilibCommon)
android.InitDefaultableModule(module)
android.InitSdkAwareModule(module)
return module
}

3
java/systemserver_classpath_fragment.go
View file

@ -83,7 +83,6 @@ func (p *platformSystemServerClasspathModule) standaloneConfiguredJars(ctx andro
type SystemServerClasspathModule struct {
android.ModuleBase
android.ApexModuleBase
android.SdkBase
ClasspathFragmentBase
@ -113,7 +112,6 @@ func systemServerClasspathFactory() android.Module {
m := &SystemServerClasspathModule{}
m.AddProperties(&m.properties)
android.InitApexModule(m)
android.InitSdkAwareModule(m)
initClasspathFragment(m, SYSTEMSERVERCLASSPATH)
android.InitAndroidArchModule(m, android.DeviceSupported, android.MultilibCommon)
return m
@ -331,7 +329,6 @@ func prebuiltSystemServerClasspathModuleFactory() android.Module {
// array.
android.InitPrebuiltModule(m, &[]string{"placeholder"})
android.InitApexModule(m)
android.InitSdkAwareModule(m)
android.InitAndroidArchModule(m, android.DeviceSupported, android.MultilibCommon)
return m
}