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

Commit a060466b authored by Cole Faust's avatar Cole Faust
Browse files

Inline board configuration call into printvars call 

This is so that:
 - It's consistent with product configuration
 - The return type of board/product config's main functions
   and the arguments to printvars can be changed without
   also making a change in the soong repository. (what I'm about
   to do)
 - Removes obsolete TODO

Bug: 221312856
Test: Presubmits
Change-Id: I593f180881eab9521012df202af8f0233bc0b6ae
parent 73097427

mk2rbc/mk2rbc.go

+1 −3
Original line number Diff line number Diff line
@@ -1871,9 +1871,7 @@ func BoardLauncher(mainModuleUri string, inputVariablesUri string) string { 
	fmt.Fprintf(&buf, "load(%q, %q)\n", baseUri, baseName)

	fmt.Fprintf(&buf, "load(%q, \"init\")\n", mainModuleUri)

	fmt.Fprintf(&buf, "load(%q, input_variables_init = \"init\")\n", inputVariablesUri)

	fmt.Fprintf(&buf, "globals, cfg, globals_base = %s(init, input_variables_init)\n", cfnBoardMain)

	fmt.Fprintf(&buf, "# TODO: Some product config variables need to be printed, but most are readonly so we can't just print cfg here.\n")

	fmt.Fprintf(&buf, "%s((globals, cfg, globals_base))\n", cfnPrintVars)

	fmt.Fprintf(&buf, "%s(%s(init, input_variables_init))\n", cfnPrintVars, cfnBoardMain)

	return buf.String()

}