diff options
| author | 2025-03-18 13:10:37 -0700 | |
|---|---|---|
| committer | 2025-03-18 13:10:37 -0700 | |
| commit | 2ab7526986336170c151ac1120d5a9a49b23c58e (patch) | |
| tree | 8b3b4bd22b6845930f062d7c4daf7c81e094b278 | |
| parent | 17e9add874924f3de83f5b51d7db0fcf4a676b5c (diff) | |
| parent | 82c066d16d1bd4dcbfe0ea4fe21d4e3e1f4e4323 (diff) | |
Merge "Add <partition>/tee support to fsgen" into main
| -rw-r--r-- | android/neverallow.go | 1 | ||||
| -rw-r--r-- | etc/prebuilt_etc.go | 11 | ||||
| -rw-r--r-- | fsgen/prebuilt_etc_modules_gen.go | 1 |
3 files changed, 13 insertions, 0 deletions
diff --git a/android/neverallow.go b/android/neverallow.go index 5c90501d7..e693f2ddd 100644 --- a/android/neverallow.go +++ b/android/neverallow.go @@ -388,6 +388,7 @@ func createPrebuiltEtcBpDefineRule() Rule { "prebuilt_radio", "prebuilt_gpu", "prebuilt_vendor_overlay", + "prebuilt_tee", ). 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 3b0c0329d..7820047ab 100644 --- a/etc/prebuilt_etc.go +++ b/etc/prebuilt_etc.go @@ -78,6 +78,7 @@ func RegisterPrebuiltEtcBuildComponents(ctx android.RegistrationContext) { ctx.RegisterModuleType("prebuilt_rfs", PrebuiltRfsFactory) ctx.RegisterModuleType("prebuilt_framework", PrebuiltFrameworkFactory) ctx.RegisterModuleType("prebuilt_res", PrebuiltResFactory) + ctx.RegisterModuleType("prebuilt_tee", PrebuiltTeeFactory) ctx.RegisterModuleType("prebuilt_wlc_upt", PrebuiltWlcUptFactory) ctx.RegisterModuleType("prebuilt_odm", PrebuiltOdmFactory) ctx.RegisterModuleType("prebuilt_vendor_dlkm", PrebuiltVendorDlkmFactory) @@ -910,6 +911,16 @@ func PrebuiltRFSAFactory() android.Module { return module } +// prebuilt_tee installs files in <partition>/tee directory. +func PrebuiltTeeFactory() android.Module { + module := &PrebuiltEtc{} + InitPrebuiltEtcModule(module, "tee") + // This module is device-only + android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibCommon) + android.InitDefaultableModule(module) + return module +} + // prebuilt_media installs media files in <partition>/media directory. func PrebuiltMediaFactory() android.Module { module := &PrebuiltEtc{} diff --git a/fsgen/prebuilt_etc_modules_gen.go b/fsgen/prebuilt_etc_modules_gen.go index 40bfc2699..e9dabe44c 100644 --- a/fsgen/prebuilt_etc_modules_gen.go +++ b/fsgen/prebuilt_etc_modules_gen.go @@ -215,6 +215,7 @@ var ( "system": etc.PrebuiltSystemFactory, "res": etc.PrebuiltResFactory, "rfs": etc.PrebuiltRfsFactory, + "tee": etc.PrebuiltTeeFactory, "tts": etc.PrebuiltVoicepackFactory, "tvconfig": etc.PrebuiltTvConfigFactory, "tvservice": etc.PrebuiltTvServiceFactory, |