From 5958625d5af0211a6b9fc69dc0169824324ae4b1 Mon Sep 17 00:00:00 2001 From: Wei Li Date: Mon, 4 Nov 2024 09:25:54 -0800 Subject: Add soong config variables of paths of *_dlkm partitions and whether they are built for a product. Update prebuilt_etc to use these variable so fs_config_dirs and fs_config_files could be installed to *_dlkm partitions. Bug: 377304441 Test: lunch aosp_cf_x86_64_phone-trunk_staging-eng && m, check fs_config_dirs and fs_config_files exist in etc/ in each partitions Change-Id: Ic90267f6b3fd60674bb27016cf5f31fc2614e35b --- android/config.go | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'android/config.go') diff --git a/android/config.go b/android/config.go index 16d77db6b..275c07fc4 100644 --- a/android/config.go +++ b/android/config.go @@ -1522,6 +1522,13 @@ func (c *deviceConfig) VendorPath() string { return "vendor" } +func (c *deviceConfig) VendorDlkmPath() string { + if c.config.productVariables.VendorDlkmPath != nil { + return *c.config.productVariables.VendorDlkmPath + } + return "vendor_dlkm" +} + func (c *deviceConfig) BuildingVendorImage() bool { return proptools.Bool(c.config.productVariables.BuildingVendorImage) } @@ -1553,6 +1560,13 @@ func (c *deviceConfig) BuildingOdmImage() bool { return proptools.Bool(c.config.productVariables.BuildingOdmImage) } +func (c *deviceConfig) OdmDlkmPath() string { + if c.config.productVariables.OdmDlkmPath != nil { + return *c.config.productVariables.OdmDlkmPath + } + return "odm_dlkm" +} + func (c *deviceConfig) ProductPath() string { if c.config.productVariables.ProductPath != nil { return *c.config.productVariables.ProductPath @@ -1571,6 +1585,20 @@ func (c *deviceConfig) SystemExtPath() string { return "system_ext" } +func (c *deviceConfig) SystemDlkmPath() string { + if c.config.productVariables.SystemDlkmPath != nil { + return *c.config.productVariables.SystemDlkmPath + } + return "system_dlkm" +} + +func (c *deviceConfig) OemPath() string { + if c.config.productVariables.OemPath != nil { + return *c.config.productVariables.OemPath + } + return "oem" +} + func (c *deviceConfig) BtConfigIncludeDir() string { return String(c.config.productVariables.BtConfigIncludeDir) } -- cgit v1.2.3-59-g8ed1b