diff options
author | 2024-11-06 22:08:28 +0000 | |
---|---|---|
committer | 2024-11-06 22:11:15 +0000 | |
commit | b9cef3b9a55bcbd150bc867a8255c42a0281bc9e (patch) | |
tree | 5b53ba8d66b31084e0f81e5844e8bbdf512723b0 | |
parent | 7b25a51963fdc4b4a352c059f5880542b263d66a (diff) |
Migrate build.prop for (system|vendor|odm)_dlkm to soong
Bug: 377562851
Test: lunch aosp_cf_x86_64_phone-trunk_staging-userdebug
Test: no diff in $PRODUCT_OUT/system_dlkm/etc/build.prop
$PRODUCT_OUT/vendor_dlkm/etc/build.prop
$PRODUCT_OUT/odm_dlkm/etc/build.prop (modulo timestamp diffs)
Change-Id: I636442de860220d2ac6f5b510038a1405013d819
-rw-r--r-- | Android.bp | 27 | ||||
-rw-r--r-- | android/build_prop.go | 9 | ||||
-rw-r--r-- | scripts/gen_build_prop.py | 2 |
3 files changed, 38 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp index cbe1c7b3f..42b7d83f7 100644 --- a/Android.bp +++ b/Android.bp @@ -206,3 +206,30 @@ build_prop { relative_install_path: "etc", // odm/etc/build.prop visibility: ["//visibility:private"], } + +build_prop { + name: "system_dlkm-build.prop", + stem: "build.prop", + system_dlkm_specific: true, + product_config: ":product_config", + relative_install_path: "etc", // system_dlkm/etc/build.prop + visibility: ["//visibility:private"], +} + +build_prop { + name: "vendor_dlkm-build.prop", + stem: "build.prop", + vendor_dlkm_specific: true, + product_config: ":product_config", + relative_install_path: "etc", // vendor_dlkm/etc/build.prop + visibility: ["//visibility:private"], +} + +build_prop { + name: "odm_dlkm-build.prop", + stem: "build.prop", + odm_dlkm_specific: true, + product_config: ":product_config", + relative_install_path: "etc", // odm_dlkm/etc/build.prop + visibility: ["//visibility:private"], +} diff --git a/android/build_prop.go b/android/build_prop.go index 554768077..838947045 100644 --- a/android/build_prop.go +++ b/android/build_prop.go @@ -109,6 +109,12 @@ func (p *buildPropModule) partition(config DeviceConfig) string { return "product" } else if p.SystemExtSpecific() { return "system_ext" + } else if p.InstallInSystemDlkm() { + return "system_dlkm" + } else if p.InstallInVendorDlkm() { + return "vendor_dlkm" + } else if p.InstallInOdmDlkm() { + return "odm_dlkm" } return "system" } @@ -119,6 +125,9 @@ var validPartitions = []string{ "product", "odm", "vendor", + "system_dlkm", + "vendor_dlkm", + "odm_dlkm", } func (p *buildPropModule) GenerateAndroidBuildActions(ctx ModuleContext) { diff --git a/scripts/gen_build_prop.py b/scripts/gen_build_prop.py index e0686ed19..0b7780e96 100644 --- a/scripts/gen_build_prop.py +++ b/scripts/gen_build_prop.py @@ -608,6 +608,8 @@ def main(): build_product_prop(args) case "vendor": build_vendor_prop(args) + case "system_dlkm" | "vendor_dlkm" | "odm_dlkm": + build_prop(args, gen_build_info=False, gen_common_build_props=True, variables=[]) case _: sys.exit(f"not supported partition {args.partition}") |