commit 1492d7a8e35b51c5699b52047eb4b17c5baa7e28
author Rico Wind <ricow@google.com> Wed Mar 29 14:05:20 2023 +0200
committer Rico Wind <ricow@google.com> Wed Mar 29 14:05:20 2023 +0200
tree 3f85470889653c02cfba6af2bb045cc0789ec85a
parent 038d9fa09ae81f9a42399699981068fd5930922e

Don't set --64 art flag when force-art-32-bit is set

Bug: 274840966
Change-Id: Ia0ae881c6603482a563e9b36089c39cbf5c20d0f

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..b8bdbae 100644
--- a/src/test/java/com/android/tools/r8/TestCompileResult.java
+++ b/src/test/java/com/android/tools/r8/TestCompileResult.java
@@ -660,7 +660,9 @@
             .add(out.toString())
             .build();
     Consumer<ArtCommandBuilder> commandConsumer =
-        withArt6Plus64BitsLib && vm.getVersion().isNewerThanOrEqual(DexVm.Version.V6_0_1)
+        withArt6Plus64BitsLib
+                && vm.getVersion().isNewerThanOrEqual(DexVm.Version.V6_0_1)
+                && !ToolHelper.force32BitArt()
             ? builder -> builder.appendArtOption("--64")
             : builder -> {};
     commandConsumer =