Merge "Define additional prebuilt_* module types" into main (7cf92c36) · Commits · e / os / android_build_soong

android/neverallow.go

+2 −0

Original line number	Diff line number	Diff line
		@@ -334,6 +334,8 @@ func createPrebuiltEtcBpDefineRule() Rule {
		"prebuilt_res",
		"prebuilt_wlc_upt",
		"prebuilt_odm",
		"prebuilt_vendor_dlkm",
		"prebuilt_bt_firmware",
		).
		DefinedInBpFile().
		Because("module type not allowed to be defined in bp file")

+22 −0

Original line number	Diff line number	Diff line
		@@ -76,6 +76,8 @@ func RegisterPrebuiltEtcBuildComponents(ctx android.RegistrationContext) {
		ctx.RegisterModuleType("prebuilt_res", PrebuiltResFactory)
		ctx.RegisterModuleType("prebuilt_wlc_upt", PrebuiltWlcUptFactory)
		ctx.RegisterModuleType("prebuilt_odm", PrebuiltOdmFactory)
		ctx.RegisterModuleType("prebuilt_vendor_dlkm", PrebuiltVendorDlkmFactory)
		ctx.RegisterModuleType("prebuilt_bt_firmware", PrebuiltBtFirmwareFactory)

		ctx.RegisterModuleType("prebuilt_defaults", defaultsFactory)

		@@ -910,3 +912,23 @@ func PrebuiltOdmFactory() android.Module {
		android.InitDefaultableModule(module)
		return module
		}

		// prebuilt_vendor_dlkm installs files in <partition>/vendor_dlkm directory.
		func PrebuiltVendorDlkmFactory() android.Module {
		module := &PrebuiltEtc{}
		InitPrebuiltEtcModule(module, "vendor_dlkm")
		// This module is device-only
		android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibCommon)
		android.InitDefaultableModule(module)
		return module
		}

		// prebuilt_bt_firmware installs files in <partition>/bt_firmware directory.
		func PrebuiltBtFirmwareFactory() android.Module {
		module := &PrebuiltEtc{}
		InitPrebuiltEtcModule(module, "bt_firmware")
		// This module is device-only
		android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibCommon)
		android.InitDefaultableModule(module)
		return module
		}