Merge "Add support for decoding proguard map to report_sample.py"

1 files changed, 8 insertions, 2 deletions

diff --git a/simpleperf/scripts/report_sample.py b/simpleperf/scripts/report_sample.py
index fbb52cf4..e1c0791f 100755
--- a/simpleperf/scripts/report_sample.py
+++ b/simpleperf/scripts/report_sample.py
@@ -21,13 +21,16 @@
 from __future__ import print_function
 from simpleperf_report_lib import ReportLib
 from simpleperf_utils import BaseArgumentParser
+from typing import List
 
 
-def report_sample(record_file, symfs_dir, kallsyms_file, show_tracing_data):
+def report_sample(record_file, symfs_dir, kallsyms_file, show_tracing_data, proguard_mapping_file : List[str] = None):
     """ read record_file, and print each sample"""
     lib = ReportLib()
 
     lib.ShowIpForUnknownSymbol()
+    for file_path in proguard_mapping_file or []:
+      lib.AddProguardMappingFile(file_path)
     if symfs_dir is not None:
         lib.SetSymfs(symfs_dir)
     if record_file is not None:
@@ -70,8 +73,11 @@ def main():
     parser.add_argument('record_file', nargs='?', default='perf.data',
                         help='Default is perf.data.')
     parser.add_argument('--show_tracing_data', action='store_true', help='print tracing data.')
+    parser.add_argument(
+        '--proguard-mapping-file', nargs='+',
+        help='Add proguard mapping file to de-obfuscate symbols')
     args = parser.parse_args()
-    report_sample(args.record_file, args.symfs, args.kallsyms, args.show_tracing_data)
+    report_sample(args.record_file, args.symfs, args.kallsyms, args.show_tracing_data, args.proguard_mapping_file)
 
 
 if __name__ == '__main__':