From 5b493cd44d2acf515db21c9934e16f91c55451b7 Mon Sep 17 00:00:00 2001 From: Spandan Das Date: Thu, 7 Nov 2024 20:55:56 +0000 Subject: Autogenerate vendor_dlkm and odm_dlkm vendor_dlkm has a depdedency on system_dlkm, and its prebuilt kernel modules will be listed as deps. Bug: 377562851 Bug: 377563262 Test: m soong_generated_vendor_dlkm_filesystem_test NOTICE and /lib/modules/modules.blocklist missing Test: m soong_generated_odm_dlkm_filesystem_test NOTICE file missing Test: verified that modules.dep,modules.load are bit identical between kati and soong for AOSP CF Change-Id: If037430313cf10f661bc2bc7bdd468ca3707b2f3 --- android/variable.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'android/variable.go') diff --git a/android/variable.go b/android/variable.go index 037037d6a..af2a5517c 100644 --- a/android/variable.go +++ b/android/variable.go @@ -628,8 +628,16 @@ type PartitionVariables struct { ProductCopyFiles map[string]string `json:",omitempty"` - BuildingSystemDlkmImage bool `json:",omitempty"` - SystemKernelModules []string `json:",omitempty"` + BuildingSystemDlkmImage bool `json:",omitempty"` + SystemKernelModules []string `json:",omitempty"` + SystemKernelBlocklistFile string `json:",omitempty"` + SystemKernelLoadModules []string `json:",omitempty"` + BuildingVendorDlkmImage bool `json:",omitempty"` + VendorKernelModules []string `json:",omitempty"` + VendorKernelBlocklistFile string `json:",omitempty"` + BuildingOdmDlkmImage bool `json:",omitempty"` + OdmKernelModules []string `json:",omitempty"` + OdmKernelBlocklistFile string `json:",omitempty"` } func boolPtr(v bool) *bool { -- cgit v1.2.3-59-g8ed1b