diff options
| author | 2025-03-13 14:04:53 -0700 | |
|---|---|---|
| committer | 2025-03-13 14:04:53 -0700 | |
| commit | 7af31c1c8a02d9c762f7d3189f1c59b920c3f019 (patch) | |
| tree | 541f012775902e1e685ef40f57903b1eae429c4b | |
| parent | f6138662ae92cbeebaae8588279ed281c4737cd5 (diff) | |
| parent | 49f074bac741dcb2064b7bc7883facbcc2054bb2 (diff) | |
Merge "Add vendor_overlay 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 d90186a08..5c90501d7 100644 --- a/android/neverallow.go +++ b/android/neverallow.go @@ -387,6 +387,7 @@ func createPrebuiltEtcBpDefineRule() Rule { "prebuilt_first_stage_ramdisk", "prebuilt_radio", "prebuilt_gpu", + "prebuilt_vendor_overlay", ). 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 6b581bcd3..3b0c0329d 100644 --- a/etc/prebuilt_etc.go +++ b/etc/prebuilt_etc.go @@ -81,6 +81,7 @@ func RegisterPrebuiltEtcBuildComponents(ctx android.RegistrationContext) { ctx.RegisterModuleType("prebuilt_wlc_upt", PrebuiltWlcUptFactory) ctx.RegisterModuleType("prebuilt_odm", PrebuiltOdmFactory) ctx.RegisterModuleType("prebuilt_vendor_dlkm", PrebuiltVendorDlkmFactory) + ctx.RegisterModuleType("prebuilt_vendor_overlay", PrebuiltVendorOverlayFactory) ctx.RegisterModuleType("prebuilt_bt_firmware", PrebuiltBtFirmwareFactory) ctx.RegisterModuleType("prebuilt_tvservice", PrebuiltTvServiceFactory) ctx.RegisterModuleType("prebuilt_optee", PrebuiltOpteeFactory) @@ -1079,6 +1080,16 @@ func PrebuiltVendorFactory() android.Module { return module } +// prebuilt_vendor_overlay is for a prebuilt artifact in <partition>/vendor_overlay directory. +func PrebuiltVendorOverlayFactory() android.Module { + module := &PrebuiltEtc{} + InitPrebuiltEtcModule(module, "vendor_overlay") + // This module is device-only + android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibCommon) + android.InitDefaultableModule(module) + return module +} + // prebuilt_sbin installs files in <partition>/sbin directory. func PrebuiltSbinFactory() android.Module { module := &PrebuiltEtc{} diff --git a/fsgen/prebuilt_etc_modules_gen.go b/fsgen/prebuilt_etc_modules_gen.go index a0b019597..df361976e 100644 --- a/fsgen/prebuilt_etc_modules_gen.go +++ b/fsgen/prebuilt_etc_modules_gen.go @@ -226,6 +226,7 @@ var ( "usr/idc": etc.PrebuiltUserIdcFactory, "vendor": etc.PrebuiltVendorFactory, "vendor_dlkm": etc.PrebuiltVendorDlkmFactory, + "vendor_overlay": etc.PrebuiltVendorOverlayFactory, "wallpaper": etc.PrebuiltWallpaperFactory, "wlc_upt": etc.PrebuiltWlcUptFactory, } |