cmdline property in bootimg can be customized for debuggable builds

This change adds product_variables.debuggable.cmdline so that the kernel
cmdline arguments can be augmented for the debuggable builds.

To support that the type of the property has changed to string array.

Bug: 181936135
Test: inspect build.ninja
Change-Id: I81b3ead5187ccb378efabb87d1d15fbdb59d8e2f
This commit is contained in:
Jiyong Park
2021-08-30 18:43:19 +09:00
parent b37a92ccc8
commit 16e77a9b30
2 changed files with 5 additions and 3 deletions

View File

@@ -108,6 +108,8 @@ type variableProperties struct {
Static_libs []string
Whole_static_libs []string
Shared_libs []string
Cmdline []string
}
// eng is true for -eng builds, and can be used to turn on additionaly heavyweight debugging

View File

@@ -60,8 +60,8 @@ type bootimgProperties struct {
// https://source.android.com/devices/bootloader/partitions/vendor-boot-partitions
Vendor_boot *bool
// Optional kernel commandline
Cmdline *string `android:"arch_variant"`
// Optional kernel commandline arguments
Cmdline []string `android:"arch_variant"`
// File that contains bootconfig parameters. This can be set only when `vendor_boot` is true
// and `header_version` is greater than or equal to 4.
@@ -152,7 +152,7 @@ func (b *bootimg) buildBootImage(ctx android.ModuleContext, vendor bool) android
dtb := android.PathForModuleSrc(ctx, dtbName)
cmd.FlagWithInput("--dtb ", dtb)
cmdline := proptools.String(b.properties.Cmdline)
cmdline := strings.Join(b.properties.Cmdline, " ")
if cmdline != "" {
flag := "--cmdline "
if vendor {