diff options
| -rw-r--r-- | android/neverallow.go | 2 | ||||
| -rw-r--r-- | etc/prebuilt_etc.go | 22 | ||||
| -rw-r--r-- | fsgen/prebuilt_etc_modules_gen.go | 2 |
3 files changed, 26 insertions, 0 deletions
diff --git a/android/neverallow.go b/android/neverallow.go index 6251e2b0d..6176a996a 100644 --- a/android/neverallow.go +++ b/android/neverallow.go @@ -336,6 +336,8 @@ func createPrebuiltEtcBpDefineRule() Rule { "prebuilt_odm", "prebuilt_vendor_dlkm", "prebuilt_bt_firmware", + "prebuilt_tvservice", + "prebuilt_optee", ). DefinedInBpFile(). Because("module type not allowed to be defined in bp file") diff --git a/etc/prebuilt_etc.go b/etc/prebuilt_etc.go index 938f3bde3..5d1d5e288 100644 --- a/etc/prebuilt_etc.go +++ b/etc/prebuilt_etc.go @@ -78,6 +78,8 @@ func RegisterPrebuiltEtcBuildComponents(ctx android.RegistrationContext) { ctx.RegisterModuleType("prebuilt_odm", PrebuiltOdmFactory) ctx.RegisterModuleType("prebuilt_vendor_dlkm", PrebuiltVendorDlkmFactory) ctx.RegisterModuleType("prebuilt_bt_firmware", PrebuiltBtFirmwareFactory) + ctx.RegisterModuleType("prebuilt_tvservice", PrebuiltTvServiceFactory) + ctx.RegisterModuleType("prebuilt_optee", PrebuiltOpteeFactory) ctx.RegisterModuleType("prebuilt_defaults", defaultsFactory) @@ -954,3 +956,23 @@ func PrebuiltBtFirmwareFactory() android.Module { android.InitDefaultableModule(module) return module } + +// prebuilt_tvservice installs files in <partition>/tvservice directory. +func PrebuiltTvServiceFactory() android.Module { + module := &PrebuiltEtc{} + InitPrebuiltEtcModule(module, "tvservice") + // This module is device-only + android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibCommon) + android.InitDefaultableModule(module) + return module +} + +// prebuilt_optee installs files in <partition>/optee directory. +func PrebuiltOpteeFactory() android.Module { + module := &PrebuiltEtc{} + InitPrebuiltEtcModule(module, "optee") + // This module is device-only + android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibCommon) + android.InitDefaultableModule(module) + return module +} diff --git a/fsgen/prebuilt_etc_modules_gen.go b/fsgen/prebuilt_etc_modules_gen.go index 1df7ec86d..362ac31b8 100644 --- a/fsgen/prebuilt_etc_modules_gen.go +++ b/fsgen/prebuilt_etc_modules_gen.go @@ -176,11 +176,13 @@ var ( "lib/rfsa": etc.PrebuiltRFSAFactory, "media": etc.PrebuiltMediaFactory, "odm": etc.PrebuiltOdmFactory, + "optee": etc.PrebuiltOpteeFactory, "overlay": etc.PrebuiltOverlayFactory, "priv-app": etc.PrebuiltPrivAppFactory, "res": etc.PrebuiltResFactory, "rfs": etc.PrebuiltRfsFactory, "tts": etc.PrebuiltVoicepackFactory, + "tvservice": etc.PrebuiltTvServiceFactory, "usr/share": etc.PrebuiltUserShareFactory, "usr/hyphen-data": etc.PrebuiltUserHyphenDataFactory, "usr/keylayout": etc.PrebuiltUserKeyLayoutFactory, |