StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Return product config variables from board_configuration" am: 4228f8f7a3

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

Change-Id: I36ebee83203c28d40498ca85935b662e222f317a
This commit is contained in:
Cole Faust
2021-11-23 21:04:27 +00:00
committed by Automerger Merge Worker
parent 5d6aa9a5b8 4228f8f7a3
commit 390d1e0795
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/product_config.rbc
View File

@@ -220,13 +220,21 @@ def _product_configuration(top_pcm_name, top_pcm, version_info):
return (globals, configs[top_pcm_name][1], globals_base) return (globals, configs[top_pcm_name][1], globals_base)
def _dictionary_difference(a, b):
result = {}
for attr, val in a.items():
if attr not in b or b[attr] != val:
result[attr] = val
return result
def _board_configuration(board_config_init, input_variables_init): def _board_configuration(board_config_init, input_variables_init):
globals = {} globals = {}
h = __h_new() h = __h_new()
input_variables_init(globals, h) input_variables_init(globals, h)
cfg_base = dict(**h[0])
globals_base = dict(**globals) globals_base = dict(**globals)
board_config_init(globals, h) board_config_init(globals, h)
return (globals, h[1], globals_base) return (globals, _dictionary_difference(h[0], cfg_base), globals_base)
def _substitute_inherited(configs, pcm_name, cfg): def _substitute_inherited(configs, pcm_name, cfg):