Merge "Migrate build.prop for (system|vendor|odm)_dlkm to soong" into main (3c0e465c) · Commits · e / os / android_build_soong

Android.bp

+27 −0

Original line number	Diff line number	Diff line
		@@ -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"],
		}

+9 −0

Original line number	Diff line number	Diff line
		@@ -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) {

+2 −0

Original line number	Diff line number	Diff line
		@@ -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}")