diff options
| author | Giuliano Procida <gprocida@google.com> | 2022-08-10 19:21:37 +0100 |
|---|---|---|
| committer | Giuliano Procida <gprocida@google.com> | 2022-08-11 15:35:04 +0000 |
| commit | 9f01685e70180ebcca3245afa85a8b72ac325972 (patch) | |
| tree | 0cfb872bb2f105421adc0e9b81274d47655e6c53 | |
| parent | 6600002eccaad5e5d2c5c2004a5af8410ec67256 (diff) | |
| download | build-9f01685e70180ebcca3245afa85a8b72ac325972.tar.gz | |
abitool.py: diff_abi --abi-tool delegated no longer invokes abidiff
Farewell `abidiff` reporting.
`abidiff` is still available as a pre-built binary and `diff_abi
--abi-tool libabigail` should continue to work.
We will not support such use-cases after Android 13.
Bug: 228843807
Change-Id: Ief321b01a356774afc881c8fc13389bde73b454b
Signed-off-by: Giuliano Procida <gprocida@google.com>
| -rw-r--r-- | abi/abitool.py | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/abi/abitool.py b/abi/abitool.py index ee16663..ac8a934 100644 --- a/abi/abitool.py +++ b/abi/abitool.py @@ -289,8 +289,6 @@ class Delegated(AbiTool): symbol_list=None, full_report=None): # shoehorn the interface basename = diff_report - abg_leaf = basename + ".leaf" - abg_full = basename + ".full" stg_basename = basename + ".stg" stg_short = stg_basename + ".short" links = { @@ -298,30 +296,16 @@ class Delegated(AbiTool): basename + ".short": stg_short, } - abidiff_leaf_changed = None - abidiff_full_changed = None stgdiff_changed = None with concurrent.futures.ThreadPoolExecutor() as executor: # fork - abidiff_leaf = executor.submit( - _run_abidiff, old_dump, new_dump, abg_leaf, symbol_list, False) - abidiff_full = executor.submit( - _run_abidiff, old_dump, new_dump, abg_full, symbol_list, True) stgdiff = executor.submit( _run_stgdiff, old_dump, new_dump, stg_basename, symbol_list) # join - abidiff_leaf_changed = abidiff_leaf.result() - abidiff_full_changed = abidiff_full.result() stgdiff_changed = stgdiff.result() - # post-process - for report in [abg_leaf, abg_full]: - _shorten_abidiff(report, report + ".short") - print("ABI diff reports have been created") - paths = [abg_leaf, abg_full, - *(f"{stg_basename}.{format}" for format in STGDIFF_FORMATS), - *(f"{path}.short" for path in [abg_leaf, abg_full])] + paths = [*(f"{stg_basename}.{format}" for format in STGDIFF_FORMATS)] for path in paths: count = _line_count(path) print(f" {path} [{count} lines]") @@ -331,8 +315,6 @@ class Delegated(AbiTool): changed = [] if stgdiff_changed: changed.append(("stgdiff", stg_short)) - if abidiff_leaf_changed: - changed.append(("abidiff (leaf changes)", abg_leaf + ".short")) if changed: print() print("ABI DIFFERENCES HAVE BEEN DETECTED!") |