Temporarily use SwissArmyKnife for toolhelper invocations
Change-Id: Icfdb78a1a9a43d4f4cb7aa88a9e47694641a80b7
diff --git a/src/main/java/com/android/tools/r8/utils/compiledump/FeatureSplitResourceShrinkerDumpUtils.java b/src/main/java/com/android/tools/r8/utils/compiledump/FeatureSplitResourceShrinkerDumpUtils.java
new file mode 100644
index 0000000..e58d34e
--- /dev/null
+++ b/src/main/java/com/android/tools/r8/utils/compiledump/FeatureSplitResourceShrinkerDumpUtils.java
@@ -0,0 +1,18 @@
+// Copyright (c) 2024, the R8 project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+package com.android.tools.r8.utils.compiledump;
+
+import com.android.tools.r8.ArchiveProtoAndroidResourceConsumer;
+import com.android.tools.r8.ArchiveProtoAndroidResourceProvider;
+import com.android.tools.r8.R8Command;
+import java.nio.file.Path;
+
+public class FeatureSplitResourceShrinkerDumpUtils {
+ public static void setupBaseResourceShrinking(
+ Path input, Path output, R8Command.Builder builder) {
+ builder.setAndroidResourceProvider(new ArchiveProtoAndroidResourceProvider(input));
+ builder.setAndroidResourceConsumer(new ArchiveProtoAndroidResourceConsumer(output));
+ }
+}
diff --git a/tools/toolhelper.py b/tools/toolhelper.py
index 5a6b8ee..cfc386c 100644
--- a/tools/toolhelper.py
+++ b/tools/toolhelper.py
@@ -69,7 +69,7 @@
'com.android.tools.r8.tracereferences.TraceReferences'
])
else:
- cmd.extend(['-jar', utils.R8_JAR, tool])
+ cmd.extend(['-cp', utils.R8_JAR, 'com.android.tools.r8.SwissArmyKnife', tool])
lib, args = extract_lib_from_args(args)
if lib:
cmd.extend(["--lib", lib])