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

Commit 3ca07a1e authored by Jihoon Kang's avatar Jihoon Kang
Browse files

Introduce prebuilt_vendor module type 

prebuilt_vendor installs the file under `<partition>/vendor`
directory. The module is used for prebuilt_* auto generation in fsgen,
and is neverallowed so that the module cannot be used in Android.bp
files.

Test: m nothing
Bug: 381888358
Change-Id: Id5fe3f5435437da7806067be99c21c4d55a91e97
parent 3216c986

android/neverallow.go

+1 −0
Original line number Original line Diff line number Diff line
@@ -341,6 +341,7 @@ func createPrebuiltEtcBpDefineRule() Rule { 
			"prebuilt_tvservice",

			"prebuilt_tvservice",

			"prebuilt_optee",

			"prebuilt_optee",

			"prebuilt_tvconfig",

			"prebuilt_tvconfig",

			"prebuilt_vendor",

		).

		).

		DefinedInBpFile().

		DefinedInBpFile().

		Because("module type not allowed to be defined in bp file")

		Because("module type not allowed to be defined in bp file")

etc/prebuilt_etc.go

+11 −0
Original line number Original line Diff line number Diff line
@@ -81,6 +81,7 @@ func RegisterPrebuiltEtcBuildComponents(ctx android.RegistrationContext) { 
	ctx.RegisterModuleType("prebuilt_tvservice", PrebuiltTvServiceFactory)

	ctx.RegisterModuleType("prebuilt_tvservice", PrebuiltTvServiceFactory)

	ctx.RegisterModuleType("prebuilt_optee", PrebuiltOpteeFactory)

	ctx.RegisterModuleType("prebuilt_optee", PrebuiltOpteeFactory)

	ctx.RegisterModuleType("prebuilt_tvconfig", PrebuiltTvConfigFactory)

	ctx.RegisterModuleType("prebuilt_tvconfig", PrebuiltTvConfigFactory)

	ctx.RegisterModuleType("prebuilt_vendor", PrebuiltVendorFactory)





	ctx.RegisterModuleType("prebuilt_defaults", defaultsFactory)

	ctx.RegisterModuleType("prebuilt_defaults", defaultsFactory)
@@ -972,3 +973,13 @@ func PrebuiltTvConfigFactory() android.Module { 
	android.InitDefaultableModule(module)

	android.InitDefaultableModule(module)

	return module

	return module

}

}



// prebuilt_vendor installs files in <partition>/vendor directory.

func PrebuiltVendorFactory() android.Module {

	module := &PrebuiltEtc{}

	InitPrebuiltEtcModule(module, "vendor")

	// This module is device-only

	android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibCommon)

	android.InitDefaultableModule(module)

	return module

}

fsgen/prebuilt_etc_modules_gen.go

+1 −0
Original line number Original line Diff line number Diff line
@@ -207,6 +207,7 @@ var ( 
		"usr/keychars":    etc.PrebuiltUserKeyCharsFactory,

		"usr/keychars":    etc.PrebuiltUserKeyCharsFactory,

		"usr/srec":        etc.PrebuiltUserSrecFactory,

		"usr/srec":        etc.PrebuiltUserSrecFactory,

		"usr/idc":         etc.PrebuiltUserIdcFactory,

		"usr/idc":         etc.PrebuiltUserIdcFactory,

		"vendor":          etc.PrebuiltVendorFactory,

		"vendor_dlkm":     etc.PrebuiltVendorDlkmFactory,

		"vendor_dlkm":     etc.PrebuiltVendorDlkmFactory,

		"wallpaper":       etc.PrebuiltWallpaperFactory,

		"wallpaper":       etc.PrebuiltWallpaperFactory,

		"wlc_upt":         etc.PrebuiltWlcUptFactory,

		"wlc_upt":         etc.PrebuiltWlcUptFactory,