commit 5bd20095623bf5851bfddae92f2825f4a4f39cf2
author Rico Wind <ricow@google.com> Tue Apr 18 09:27:54 2023 +0000
committer Rico Wind <ricow@google.com> Tue Apr 18 10:44:58 2023 +0000
tree 6119771d3d2e18bfb5b85f0bd32227e4678419a2
parent 1934cf3f075d99d5f323f55a6a6cc3695a6c79ca

Revert "Correctly pass --32 for all art invocations when set (bots only)"

This reverts commit 038d9fa09ae81f9a42399699981068fd5930922e.

Reason for revert: updated chrome image with 64 bit lib

Change-Id: I378a773e0393de55619d076c777ddb16b094d1e5

src/test/java/com/android/tools/r8/TestCompileResult.java

diff --git a/src/test/java/com/android/tools/r8/TestCompileResult.java b/src/test/java/com/android/tools/r8/TestCompileResult.java
index dfdfa9d..ce189e6 100644
--- a/src/test/java/com/android/tools/r8/TestCompileResult.java
+++ b/src/test/java/com/android/tools/r8/TestCompileResult.java
@@ -660,9 +660,11 @@
             .add(out.toString())
             .build();
     Consumer<ArtCommandBuilder> commandConsumer =
-        withArt6Plus64BitsLib && vm.getVersion().isNewerThanOrEqual(DexVm.Version.V6_0_1)
-            ? builder -> builder.appendArtOption("--64")
-            : builder -> {};
+        ToolHelper.force32BitArt()
+            ? builder -> builder.appendArtOption("--32")
+            : withArt6Plus64BitsLib && vm.getVersion().isNewerThanOrEqual(DexVm.Version.V6_0_1)
+                ? builder -> builder.appendArtOption("--64")
+                : builder -> {};
     commandConsumer =
         commandConsumer.andThen(
             builder -> {

src/test/java/com/android/tools/r8/ToolHelper.java

diff --git a/src/test/java/com/android/tools/r8/ToolHelper.java b/src/test/java/com/android/tools/r8/ToolHelper.java
index 404c51d..1de3552 100644
--- a/src/test/java/com/android/tools/r8/ToolHelper.java
+++ b/src/test/java/com/android/tools/r8/ToolHelper.java
@@ -488,8 +488,9 @@
         result.add("/bin/bash");
       }
       result.add(getExecutable());
-      result.addAll(getExecutableArguments());
-      result.addAll(options);
+      for (String option : options) {
+        result.add(option);
+      }
       for (Map.Entry<String, String> entry : systemProperties.entrySet()) {
         StringBuilder builder = new StringBuilder("-D");
         builder.append(entry.getKey());
@@ -507,7 +508,9 @@
       if (mainClass != null) {
         result.add(mainClass);
       }
-      result.addAll(programArguments);
+      for (String argument : programArguments) {
+        result.add(argument);
+      }
       return result;
     }
 
@@ -526,8 +529,6 @@
     protected abstract boolean shouldUseDocker();
 
     protected abstract String getExecutable();
-
-    protected abstract List<String> getExecutableArguments();
   }
 
   public static class ArtCommandBuilder extends CommandBuilder {
@@ -562,11 +563,6 @@
       return version != null ? getArtBinary(version) : getArtBinary();
     }
 
-    @Override
-    protected List<String> getExecutableArguments() {
-      return force32BitArt() ? ImmutableList.of("--32") : ImmutableList.of();
-    }
-
     public boolean isForDevice() {
       return version.getKind() == Kind.TARGET;
     }