tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Revert "Fix inheritance order"" am: ea8eedde00 am: 3f67c2235a

Browse source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2054825

Change-Id: I7132665f117006d3bc33039662948bc108337b03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2022-04-04 21:50:32 +00:00 committed by Automerger Merge Worker
commit 64d83852e8
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'. # Now we know everything about this PCM, record it in 'configs'.
children = handle.inherited_modules children = handle.inherited_modules
if _options.trace_modules: if _options.trace_modules:
print("# ", " ".join(sorted(children.keys()))) print("# ", " ".join(children.keys()))
configs[name] = (pcm, handle.cfg, sorted(children.keys()), False) configs[name] = (pcm, handle.cfg, children.keys(), False)
pcm_count = pcm_count + 1 pcm_count = pcm_count + 1
if len(children) == 0: 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): def init(g, handle):
cfg = rblf.cfg(handle) cfg = rblf.cfg(handle)
rblf.inherit(handle, "test/inherit2", _inherit2_init)
rblf.inherit(handle, "test/inherit1", _inherit1_init) rblf.inherit(handle, "test/inherit1", _inherit1_init)
rblf.inherit(handle, "test/inherit2", _inherit2_init)
cfg["PRODUCT_DEFAULT_DEV_CERTIFICATE"] = "" cfg["PRODUCT_DEFAULT_DEV_CERTIFICATE"] = ""