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

Allow explicitly specified additional annotations for hiddenapi

Browse Source 
Adds the hiddenapi_additional_annotations to allow a library to list
the libraries that provided additional hiddenapi related annotations
for a library.

Modifies merge_csv.py so it can process multiple zip files at the same
time and uses that to merge the embedded .uau files from a module and
those it depends upon.

Bug: 180102243
Test: m droid
      Verified that hiddenapi files (both aggregated ones and for the
      individual modules) are not affected by this change.
Change-Id: I796520021c7357398a9e2a09f1029e4a578b05b3
This commit is contained in:
Paul Duffin
2021-02-12 11:46:42 +00:00
parent 7ad17bdad5
commit 031d8693b3
4 changed files with 58 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
scripts/hiddenapi/merge_csv.py
View File

@@ -26,7 +26,8 @@ from zipfile import ZipFile
args_parser = argparse.ArgumentParser(description='Merge given CSV files into a single one.')
args_parser.add_argument('--header', help='Comma separated field names; '
'if missing determines the header from input files.')
args_parser.add_argument('--zip_input', help='ZIP archive with all CSV files to merge.')
args_parser.add_argument('--zip_input', help='Treat files as ZIP archives containing CSV files to merge.',
action="store_true")
args_parser.add_argument('--output', help='Output file for merged CSV.',
default='-', type=argparse.FileType('w'))
args_parser.add_argument('files', nargs=argparse.REMAINDER)
@@ -36,20 +37,16 @@ args = args_parser.parse_args()
def dict_reader(input):
return csv.DictReader(input, delimiter=',', quotechar='|')
if args.zip_input and len(args.files) > 0:
raise ValueError('Expecting either a single ZIP with CSV files'
' or a list of CSV files as input; not both.')
csv_readers = []
if len(args.files) > 0:
if not(args.zip_input):
for file in args.files:
csv_readers.append(dict_reader(open(file, 'r')))
elif args.zip_input:
with ZipFile(args.zip_input) as zip:
for entry in zip.namelist():
if entry.endswith('.uau'):
csv_readers.append(dict_reader(io.TextIOWrapper(zip.open(entry, 'r'))))
else:
for file in args.files:
with ZipFile(file) as zip:
for entry in zip.namelist():
if entry.endswith('.uau'):
csv_readers.append(dict_reader(io.TextIOWrapper(zip.open(entry, 'r'))))
headers = set()
if args.header: