commit 3b6b9370dfc0380b8963f18aaaad6c221a031bb8
author Treehugger Robot <treehugger-gerrit@google.com> Wed Sep 01 21:54:17 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Sep 01 21:54:17 2021 +0000
tree 87084dc3c6831f4f345060a05d45406e581f8f0d
parent dc61112a004cab932c03a9df18e41d1ea2a28b93
parent 6970369c95c0241d9d3aecbeae7df3a42ce7186c

Merge "Fix: print namespace variable names, too." am: b94feb7cb6 am: 3811c64978 am: eda226dcf2 am: 0d06608af0 am: 6970369c95

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

Change-Id: I4d6deede3b59bbcf4febbd89bca57919dcccfc98

core/product_config.rbc

diff --git a/core/product_config.rbc b/core/product_config.rbc
index 8fbcfa5..28b37a3 100644
--- a/core/product_config.rbc
+++ b/core/product_config.rbc
@@ -82,7 +82,7 @@
                     # Define SOONG_CONFIG_<ns> for Make, othewise
                     # it cannot be added to .KATI_READONLY list
                     if _options.format == "make":
-                        print("SOONG_CONFIG_" + nsname, ":=")
+                        print("SOONG_CONFIG_" + nsname, ":=", " ".join(nsvars.keys()))
                     for var, val in sorted(nsvars.items()):
                         __print_attr("SOONG_CONFIG_%s_%s" % (nsname, var), val)
             elif attr not in _globals_base: