PWN-Hunter/android_build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Fix inheritance order"

Browse Source 
This reverts commit 670c587c09.

Reason for revert: Breaks RBC product config for more products than it fixes: b/228044099

Change-Id: I614663311f67b3631a0cee427453c550fc426c8b
This commit is contained in:
Cole Faust 2022-04-04 17:28:28 +00:00
parent 670c587c09
commit 56d7c008bc
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/product_config.rbc
View File

@ -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:

2
tests/single_value_inheritance/product.rbc
View File

@ -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"] = ""