StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "cmdline property in bootimg can be customized for debuggable builds"

Browse Source
This commit is contained in:
Treehugger Robot
2021-08-31 01:59:40 +00:00
committed by Gerrit Code Review
parent 50ae168d6d 16e77a9b30
commit 4b2435bc79
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/variable.go
View File

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

6
filesystem/bootimg.go
View File

@@ -60,8 +60,8 @@ type bootimgProperties struct {
// https://source.android.com/devices/bootloader/partitions/vendor-boot-partitions // https://source.android.com/devices/bootloader/partitions/vendor-boot-partitions
Vendor_boot *bool Vendor_boot *bool
// Optional kernel commandline // Optional kernel commandline arguments
Cmdline *string `android:"arch_variant"` Cmdline []string `android:"arch_variant"`
// File that contains bootconfig parameters. This can be set only when `vendor_boot` is true // 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. // 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) dtb := android.PathForModuleSrc(ctx, dtbName)
cmd.FlagWithInput("--dtb ", dtb) cmd.FlagWithInput("--dtb ", dtb)
cmdline := proptools.String(b.properties.Cmdline) cmdline := strings.Join(b.properties.Cmdline, " ")
if cmdline != "" { if cmdline != "" {
flag := "--cmdline " flag := "--cmdline "
if vendor { if vendor {