Skip to content

Commit 0352f4f

Browse files
committed
Print notice files to cover
1 parent 429b02a commit 0352f4f

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

src/fosslight_android/android_binary_analysis.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -327,21 +327,24 @@ def get_result_of_notice_html(found_on_html, notice_file_found):
327327

328328
def find_notice_value():
329329
global notice_file_list, final_bin_info
330+
str_notice_files = ""
330331

331332
try:
332333
notice_file_list, notice_files = read_notice_file(os.path.abspath(build_out_notice_file_path), NOTICE_HTML_FILE_NAME)
333334
if not notice_file_list:
334335
logger.info(f"Notice file is empty:{notice_files}")
335336
return
336337
if notice_files:
337-
logger.info(f"Notice files:{notice_files}")
338+
str_notice_files = ",".join(notice_files)
339+
logger.info(f"Notice files:{str_notice_files}")
338340
else:
339341
logger.debug("Can't find a notiece file")
340342
return_list = do_multi_process(find_notice_html, final_bin_info)
341343
final_bin_info = return_list[:]
342344

343345
except IOError as error: # 'CANNOT_FIND_NOTICE_HTML'
344346
logger.debug(f"find_notice_value:{error}")
347+
return str_notice_files
345348

346349

347350
def find_notice_html(bin_info, return_list):
@@ -844,7 +847,7 @@ def main():
844847

845848
map_binary_module_name_and_path(find_binaries_from_out_dir())
846849

847-
find_notice_value()
850+
notice_files = find_notice_value()
848851
find_bin_license_info()
849852

850853
set_mk_file_path() # Mk file path and local path, location of NOTICE file, can be different
@@ -862,6 +865,7 @@ def main():
862865
start_time=now,
863866
input_path=android_src_path)
864867
cover.comment = f"Total number of binaries: {len(final_bin_info)}"
868+
cover.comment += f"\nNotice: {notice_files}"
865869
write_result(result_excel_file, final_bin_info, cover)
866870
result_log["Output FOSSLight Report"] = result_excel_file
867871

0 commit comments

Comments
 (0)