commit f984cf1ca67ebcbcffe7fc12a073d1497f658e54
author Morten Krogh-Jespersen <mkroghj@google.com> Sun Sep 10 22:48:44 2023 +0200
committer Morten Krogh-Jespersen <mkroghj@google.com> Mon Sep 11 09:15:15 2023 +0000
tree 044651fe0e4c3c768f8196984a2288610a29005a
parent ab96e20c553a6899fdb87a42d04a2a07725048c0

Update tools/retrace.py to take in custom r8jar

Change-Id: I821024209461f4f03232556b743bf6f4da56d08e

tools/retrace.py

diff --git a/tools/retrace.py b/tools/retrace.py
index cbb2d33..1a9deb5 100755
--- a/tools/retrace.py
+++ b/tools/retrace.py
@@ -41,6 +41,10 @@
       help='Path to r8lib map.',
       default=None)
   parser.add_argument(
+    '--r8jar',
+    help='Path to r8 jar.',
+    default=None)
+  parser.add_argument(
       '--no-r8lib',
       '--no_r8lib',
       default=False,
@@ -139,6 +143,8 @@
       return map_path
 
   # If no other map file was found, use the local mapping file.
+  if args.r8jar:
+    return args.r8jar + ".map"
   return utils.R8LIB_MAP
 
 
@@ -166,6 +172,7 @@
     return run(
       map_path,
       args.stacktrace,
+      args.r8jar,
       args.no_r8lib,
       quiet=args.quiet,
       debug=args.debug_agent,
@@ -173,16 +180,19 @@
       verbose=args.verbose)
 
 
-def run(map_path, stacktrace, no_r8lib, quiet=False, debug=False, regex=None, verbose=False):
+def run(map_path, stacktrace, r8jar, no_r8lib, quiet=False, debug=False, regex=None, verbose=False):
   retrace_args = [jdk.GetJavaExecutable()]
 
   if debug:
     retrace_args.append(
         '-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005')
 
+  if not r8jar:
+    r8jar = utils.R8_JAR if no_r8lib else utils.R8RETRACE_JAR
+
   retrace_args += [
     '-cp',
-    utils.R8_JAR if no_r8lib else utils.R8RETRACE_JAR,
+    r8jar,
     'com.android.tools.r8.retrace.Retrace',
     map_path
   ]