Merge "compare_cts_reports: do not show ignored ABI in the sheet" into main am: b9bd79b5e3 am: 6a59d7737f

Original change: https://android-review.googlesource.com/c/platform/development/+/2867874

Change-Id: Idb8fd8f95f016bcc2eb370d2f77dd0bf4081c696
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

tools/compare_cts_reports/constant.py

@@ -22,3 +22,5 @@ VERSION = '1.0'
 NO_DATA = 'null'
 TESTED_ITEMS = 'tested_items'
 PASS_RATE = 'pass_rate'
+
+ABI_IGNORED = 'abi-ignored'

tools/compare_cts_reports/generate_spread_sheet.py

@@ -27,6 +27,7 @@ python3 generate_spread_sheet.py \
 """
 
 import argparse
+import constant
 import csv
 import gspread
 import os
@@ -183,7 +184,9 @@ def _write_compare_details(
 
     # Module changes, need a new header row.
     if module_name != curr_module:
-      rows_content.append([f'{module_name} [{abi}]', ''] + [''] * num_reports)
+      module_with_abi = (module_name if abi == constant.ABI_IGNORED
+                         else f'{module_name} [{abi}]')
+      rows_content.append([module_with_abi, ''] + [''] * num_reports)
       module_header_row = len(rows_content)
       header_cell = _get_range_cell(
           begin_row=curr_row, begin_column='A',

tools/compare_cts_reports/parse_cts_report.py

@@ -134,7 +134,7 @@ class CtsReport:
 
     for module in root.iter('Module'):
       module_name = module.attrib['name']
-      abi = 'ignored' if ignore_abi else module.attrib['abi']
+      abi = constant.ABI_IGNORED if ignore_abi else module.attrib['abi']
 
       for testcase in module.iter('TestCase'):
         class_name = testcase.attrib['name']