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

Commit d796f6f6 authored by Paul Duffin's avatar Paul Duffin
Browse files

Stop module types being SdkAware 

Removes all usages of SdkBase and InitSdkAwareModule.

Bug: 260237150
Test: m nothing
Change-Id: I07db8afc805eadbeb5b23f2e1d2f51567eecfab0
parent 5e71e68a

android/license.go

+0 −2
Original line number Diff line number Diff line
@@ -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)

apex/apex.go

+0 −2
Original line number Diff line number Diff line
@@ -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)

cc/cc.go

+0 −2
Original line number Diff line number Diff line
@@ -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

cc/prebuilt.go

+0 −3
Original line number Diff line number Diff line
@@ -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

}

java/base.go

+0 −1
Original line number Diff line number Diff line
@@ -395,7 +395,6 @@ type Module struct { 
	android.ModuleBase

	android.DefaultableModuleBase

	android.ApexModuleBase

	android.SdkBase

	android.BazelModuleBase



	// Functionality common to Module and Import.