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

Commit ecf76ddd authored by Jihoon Kang's avatar Jihoon Kang
Browse files

Define prebuilt_tvconfig module type 

This module type is used only in fsgen package for prebuilt_* module
generation.

Test: lunch <failing product> && m nothing
Bug: 378585811
Change-Id: I13d7affc636f3a613cc396b379e8b5937189aa79
parent 48a943f6

android/neverallow.go

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

			"prebuilt_tvservice",

			"prebuilt_optee",

			"prebuilt_tvconfig",

		).

		DefinedInBpFile().

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

etc/prebuilt_etc.go

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

	ctx.RegisterModuleType("prebuilt_tvservice", PrebuiltTvServiceFactory)

	ctx.RegisterModuleType("prebuilt_optee", PrebuiltOpteeFactory)

	ctx.RegisterModuleType("prebuilt_tvconfig", PrebuiltTvConfigFactory)



	ctx.RegisterModuleType("prebuilt_defaults", defaultsFactory)
@@ -961,3 +962,13 @@ func PrebuiltOpteeFactory() android.Module { 
	android.InitDefaultableModule(module)

	return module

}



// prebuilt_tvconfig installs files in <partition>/tvconfig directory.

func PrebuiltTvConfigFactory() android.Module {

	module := &PrebuiltEtc{}

	InitPrebuiltEtcModule(module, "tvconfig")

	// 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 Diff line number Diff line
@@ -194,6 +194,7 @@ var ( 
		"res":             etc.PrebuiltResFactory,

		"rfs":             etc.PrebuiltRfsFactory,

		"tts":             etc.PrebuiltVoicepackFactory,

		"tvconfig":        etc.PrebuiltTvConfigFactory,

		"tvservice":       etc.PrebuiltTvServiceFactory,

		"usr/share":       etc.PrebuiltUserShareFactory,

		"usr/hyphen-data": etc.PrebuiltUserHyphenDataFactory,