Update new gradle setup to compile r8lib with and without dependencies
Bug: b/270105162
Change-Id: I1fd6f44e956805ea69094eb22c93effaf622cb18
diff --git a/tools/create_r8lib.py b/tools/create_r8lib.py
index 51e2fd6..1b6c52f 100755
--- a/tools/create_r8lib.py
+++ b/tools/create_r8lib.py
@@ -52,6 +52,11 @@
'--r8jar',
required=True,
help='The R8 jar to compile')
+ parser.add_argument(
+ '--r8compiler',
+ required=True,
+ default='build/libs/r8_with_deps.jar',
+ help='The R8 compiler to use')
return parser.parse_args()
def get_r8_version(r8jar):
@@ -89,7 +94,7 @@
cmd = [jdk.GetJavaExecutable(), '-Xmx8g', '-ea']
if args.debug_agent:
cmd.extend(['-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:5005'])
- cmd.extend(['-cp', 'build/libs/r8_with_deps.jar', 'com.android.tools.r8.R8'])
+ cmd.extend(['-cp', args.r8compiler, 'com.android.tools.r8.R8'])
cmd.append(args.r8jar)
cmd.append('--classfile')
cmd.extend(['--map-id-template', map_id_template])
