Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b2435bc authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents 50ae168d 16e77a9b

android/variable.go

+2 −0
Original line number Diff line number Diff line
@@ -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

filesystem/bootimg.go

+3 −3
Original line number Diff line number Diff line
@@ -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 {