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

Merge "Create common.LoadDictionaryFromFile"

Browse Source
This commit is contained in:
Kiyoung Kim
2019-06-27 00:27:49 +00:00
committed by Gerrit Code Review
parent 90f638d842 ebe7c9c92f
commit fc195fee44
2 changed files with 24 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tools/releasetools/common.py
View File

@@ -459,6 +459,13 @@ def LoadBuildProp(read_helper, prop_file):
return LoadDictionaryFromLines(data.split("\n")) return LoadDictionaryFromLines(data.split("\n"))
def LoadDictionaryFromFile(file_path):
with open(file_path) as f:
lines = list(f.read().splitlines())
return LoadDictionaryFromLines(lines)
def LoadDictionaryFromLines(lines): def LoadDictionaryFromLines(lines):
d = {} d = {}
for line in lines: for line in lines:

45
tools/releasetools/merge_target_files.py
View File

@@ -334,9 +334,9 @@ def validate_config_lists(framework_item_list, framework_misc_info_keys,
in_vendor = any(item.startswith(partition) for item in vendor_item_list) in_vendor = any(item.startswith(partition) for item in vendor_item_list)
if in_framework and in_vendor: if in_framework and in_vendor:
logger.error( logger.error(
'Cannot extract items from {0} for both the framework and vendor builds. ' 'Cannot extract items from {0} for both the framework and vendor'
'Please ensure only one merge config item list includes {0}.'.format( ' builds. Please ensure only one merge config item list'
partition)) ' includes {0}.'.format(partition))
has_error = True has_error = True
if ('dynamic_partition_list' in framework_misc_info_keys) or ( if ('dynamic_partition_list' in framework_misc_info_keys) or (
@@ -500,18 +500,14 @@ def process_misc_info_txt(framework_target_files_temp_dir,
instance. instance.
""" """
def read_helper(d): misc_info_path = ['META', 'misc_info.txt']
misc_info_txt = os.path.join(d, 'META', 'misc_info.txt') framework_dict = common.LoadDictionaryFromFile(
with open(misc_info_txt) as f: os.path.join(framework_target_files_temp_dir, *misc_info_path))
return list(f.read().splitlines())
framework_dict = common.LoadDictionaryFromLines(
read_helper(framework_target_files_temp_dir))
# We take most of the misc info from the vendor target files. # We take most of the misc info from the vendor target files.
merged_dict = common.LoadDictionaryFromLines( merged_dict = common.LoadDictionaryFromFile(
read_helper(vendor_target_files_temp_dir)) os.path.join(vendor_target_files_temp_dir, *misc_info_path))
# Replace certain values in merged_dict with values from # Replace certain values in merged_dict with values from
# framework_dict. # framework_dict.
@@ -578,16 +574,12 @@ def process_dynamic_partitions_info_txt(framework_target_files_dir,
'dynamic_partitions_info.txt')): 'dynamic_partitions_info.txt')):
return return
def read_helper(d): dynamic_partitions_info_path = ['META', 'dynamic_partitions_info.txt']
dynamic_partitions_info_txt = os.path.join(d, 'META',
'dynamic_partitions_info.txt')
with open(dynamic_partitions_info_txt) as f:
return list(f.read().splitlines())
framework_dynamic_partitions_dict = common.LoadDictionaryFromLines( framework_dynamic_partitions_dict = common.LoadDictionaryFromFile(
read_helper(framework_target_files_dir)) os.path.join(framework_target_files_dir, *dynamic_partitions_info_path))
vendor_dynamic_partitions_dict = common.LoadDictionaryFromLines( vendor_dynamic_partitions_dict = common.LoadDictionaryFromFile(
read_helper(vendor_target_files_dir)) os.path.join(vendor_target_files_dir, *dynamic_partitions_info_path))
merged_dynamic_partitions_dict = merge_dynamic_partition_info_dicts( merged_dynamic_partitions_dict = merge_dynamic_partition_info_dicts(
framework_dict=framework_dynamic_partitions_dict, framework_dict=framework_dynamic_partitions_dict,
@@ -854,12 +846,8 @@ def merge_target_files(temp_dir, framework_target_files, framework_item_list,
misc_info_txt = os.path.join(output_target_files_temp_dir, 'META', misc_info_txt = os.path.join(output_target_files_temp_dir, 'META',
'misc_info.txt') 'misc_info.txt')
def read_helper(): use_dynamic_partitions = common.LoadDictionaryFromFile(misc_info_txt).get(
with open(misc_info_txt) as f: 'use_dynamic_partitions')
return list(f.read().splitlines())
use_dynamic_partitions = common.LoadDictionaryFromLines(
read_helper()).get('use_dynamic_partitions')
if use_dynamic_partitions != 'true' and output_super_empty: if use_dynamic_partitions != 'true' and output_super_empty:
raise ValueError( raise ValueError(
@@ -1000,7 +988,8 @@ def main():
OPTIONS.framework_item_list = a OPTIONS.framework_item_list = a
elif o == '--system-misc-info-keys': elif o == '--system-misc-info-keys':
logger.warning( logger.warning(
'--system-misc-info-keys has been renamed to --framework-misc-info-keys' '--system-misc-info-keys has been renamed to '
'--framework-misc-info-keys'
) )
OPTIONS.framework_misc_info_keys = a OPTIONS.framework_misc_info_keys = a
elif o == '--framework-misc-info-keys': elif o == '--framework-misc-info-keys':