Merge "Inline board configuration call into printvars call" am: 6028b556ec am: 60b02a09a5 am: b07232493a

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2002772

Change-Id: I0c80e350ee9d950fb0cc0c4be3bfebeb20efe921
This commit is contained in:
Treehugger Robot 2022-03-02 04:47:33 +00:00 committed by Automerger Merge Worker
commit 3f54ac4493

View file

@ -1870,9 +1870,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()
}