Print the default SOONG_ONLY value of the product in lunch output
SOONG_ONLY=false is currently printed as the output of lunch even for
enabled products such as `aosp_cf_x86_64_phone`.
config.soongOnlyRequested evaluates to true during the main build (it
invokes `runMakeProductConfig), but is currently always false when used
in report_config.
Test: lunch aosp_cf_x86_64_phone-trunk_staging-userdebug # SOONG_ONLY=true (previously
false)
Test: lunch cf_x86_64_phone-trunk_staging-userdebug # SOONG_ONLY=false
Bug: 402519768
Change-Id: If859695a583c6627af05fb62eb0f8b3fa93aeec8
diff --git a/ui/build/dumpvars.go b/ui/build/dumpvars.go
index 16a3db8..710be84 100644
--- a/ui/build/dumpvars.go
+++ b/ui/build/dumpvars.go
@@ -181,7 +181,12 @@
fmt.Fprintf(b, "%s=%s\n", name, make_vars[name])
}
}
- fmt.Fprintf(b, "SOONG_ONLY=%t\n", config.soongOnlyRequested)
+ if config.skipKatiControlledByFlags {
+ fmt.Fprintf(b, "SOONG_ONLY=%t\n", config.soongOnlyRequested)
+ } else { // default for this product
+ fmt.Fprintf(b, "SOONG_ONLY=%t\n", make_vars["PRODUCT_SOONG_ONLY"] == "true")
+ }
+
fmt.Fprint(b, "============================================")
return b.String()