Revert "Force 32 bit art for dex vm 7.0.0 on the bots"
This reverts commit 4f5ec10feca3dc307f6bd6cdc2e85c4f7db6f2f2.
Reason for revert: updated chrome image
Change-Id: I2e489f18543808bb5af85c846b38dbbb70747092
diff --git a/build.gradle b/build.gradle
index 9f4cf29..e614057 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2238,9 +2238,6 @@
systemProperty 'slow_tests', project.property('slow_tests')
}
- if (project.hasProperty('force_32_bit_art')) {
- systemProperty 'force_32_bit_art', project.property('force_32_bit_art')
- }
if (project.hasProperty('desugar_jdk_json_dir')) {
systemProperty 'desugar_jdk_json_dir', project.property('desugar_jdk_json_dir')
diff --git a/infra/config/global/generated/cr-buildbucket.cfg b/infra/config/global/generated/cr-buildbucket.cfg
index f461b56..ff1df31 100644
--- a/infra/config/global/generated/cr-buildbucket.cfg
+++ b/infra/config/global/generated/cr-buildbucket.cfg
@@ -861,7 +861,6 @@
' "test_options": ['
' "--dex_vm=7.0.0",'
' "--all_tests",'
- ' "--force-32-bit-art",'
' "--tool=r8",'
' "--no_internal",'
' "--one_line_per_test",'
@@ -899,7 +898,6 @@
' "test_options": ['
' "--dex_vm=7.0.0",'
' "--all_tests",'
- ' "--force-32-bit-art",'
' "--tool=r8",'
' "--no_internal",'
' "--one_line_per_test",'
diff --git a/infra/config/global/main.star b/infra/config/global/main.star
index 40ea46a..32abb36 100755
--- a/infra/config/global/main.star
+++ b/infra/config/global/main.star
@@ -302,7 +302,7 @@
r8_tester_with_default("linux-android-6.0.1",
["--dex_vm=6.0.1", "--all_tests"])
r8_tester_with_default("linux-android-7.0.0",
- ["--dex_vm=7.0.0", "--all_tests", "--force-32-bit-art"])
+ ["--dex_vm=7.0.0", "--all_tests"])
r8_tester_with_default("linux-android-8.1.0",
["--dex_vm=8.1.0", "--all_tests"])
r8_tester_with_default("linux-android-9.0.0",
diff --git a/src/test/java/com/android/tools/r8/TestCompileResult.java b/src/test/java/com/android/tools/r8/TestCompileResult.java
index ce189e6..dfdfa9d 100644
--- a/src/test/java/com/android/tools/r8/TestCompileResult.java
+++ b/src/test/java/com/android/tools/r8/TestCompileResult.java
@@ -660,11 +660,9 @@
.add(out.toString())
.build();
Consumer<ArtCommandBuilder> commandConsumer =
- ToolHelper.force32BitArt()
- ? builder -> builder.appendArtOption("--32")
- : withArt6Plus64BitsLib && vm.getVersion().isNewerThanOrEqual(DexVm.Version.V6_0_1)
- ? builder -> builder.appendArtOption("--64")
- : builder -> {};
+ withArt6Plus64BitsLib && vm.getVersion().isNewerThanOrEqual(DexVm.Version.V6_0_1)
+ ? builder -> builder.appendArtOption("--64")
+ : builder -> {};
commandConsumer =
commandConsumer.andThen(
builder -> {
diff --git a/src/test/java/com/android/tools/r8/ToolHelper.java b/src/test/java/com/android/tools/r8/ToolHelper.java
index 1de3552..8479714 100644
--- a/src/test/java/com/android/tools/r8/ToolHelper.java
+++ b/src/test/java/com/android/tools/r8/ToolHelper.java
@@ -1848,10 +1848,6 @@
return new ProcessResult(passed ? 0 : -1, "", stdErr);
}
- public static boolean force32BitArt() {
- return System.getProperty("force_32_bit_art") != null;
- }
-
public static boolean dealsWithGoldenFiles() {
return compareAgaintsGoldenFiles() || generateGoldenFiles();
}
diff --git a/tools/test.py b/tools/test.py
index 3c52be4..2f0254c 100755
--- a/tools/test.py
+++ b/tools/test.py
@@ -82,9 +82,6 @@
result.add_option('--slow-tests', '--slow_tests',
help='Also run slow tests.',
default=False, action='store_true')
- result.add_option('--force-32-bit-art', '--force_32_bit_art',
- help='Force art to run 32 bits.',
- default=False, action='store_true')
result.add_option('-v', '--verbose',
help='Print test stdout to, well, stdout.',
default=False, action='store_true')
@@ -293,8 +290,6 @@
gradle_args.append('-Pall_tests')
if options.slow_tests:
gradle_args.append('-Pslow_tests=1')
- if options.force_32_bit_art:
- gradle_args.append('-Pforce_32_bit_art=1')
if options.tool:
gradle_args.append('-Ptool=%s' % options.tool)
if options.one_line_per_test:
