diff options
| author | 2022-04-04 17:28:28 +0000 | |
|---|---|---|
| committer | 2022-04-04 17:28:28 +0000 | |
| commit | 56d7c008bc2e37a74bbf34a4b7fe82c22b53847b (patch) | |
| tree | fc8f313492246371a09261818f2db87a5dc1bebf | |
| parent | 670c587c09ae68e72077f5bca70e71feebc523cb (diff) | |
Revert "Fix inheritance order"
This reverts commit 670c587c09ae68e72077f5bca70e71feebc523cb.
Reason for revert: Breaks RBC product config for more products than it fixes: b/228044099
Change-Id: I614663311f67b3631a0cee427453c550fc426c8b
| -rw-r--r-- | core/product_config.rbc | 4 | ||||
| -rw-r--r-- | tests/single_value_inheritance/product.rbc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/product_config.rbc b/core/product_config.rbc index 192e40916d..0e7dbf186d 100644 --- a/core/product_config.rbc +++ b/core/product_config.rbc @@ -167,8 +167,8 @@ def _product_configuration(top_pcm_name, top_pcm, input_variables_init): # Now we know everything about this PCM, record it in 'configs'. children = handle.inherited_modules if _options.trace_modules: - print("# ", " ".join(sorted(children.keys()))) - configs[name] = (pcm, handle.cfg, sorted(children.keys()), False) + print("# ", " ".join(children.keys())) + configs[name] = (pcm, handle.cfg, children.keys(), False) pcm_count = pcm_count + 1 if len(children) == 0: diff --git a/tests/single_value_inheritance/product.rbc b/tests/single_value_inheritance/product.rbc index d090af61e3..332704351f 100644 --- a/tests/single_value_inheritance/product.rbc +++ b/tests/single_value_inheritance/product.rbc @@ -18,7 +18,7 @@ load(":inherit2.rbc", _inherit2_init = "init") def init(g, handle): cfg = rblf.cfg(handle) - rblf.inherit(handle, "test/inherit2", _inherit2_init) rblf.inherit(handle, "test/inherit1", _inherit1_init) + rblf.inherit(handle, "test/inherit2", _inherit2_init) cfg["PRODUCT_DEFAULT_DEV_CERTIFICATE"] = "" |