Revert "Add standalone ART gtests to `TEST_MAPPING` group `presubmit`."

This reverts commit 66372d2c444b1badaa0e3972001dea3f31c0d339.

Reason for revert: Some standalone ART gtests are failing in presubmits
when built from sources where the Oat file version has been updated
-- compared to current prebuilt ART APEXes -- and run against such a
prebuilt ART APEX, that does not include that Oat version change.

Test: Rely on TreeHugger presubmits
Bug: 193218514
Bug: 152379281
Bug: 194403904
Change-Id: I88a9e7801dcc98940209d361af385bdcbb6e5099
Merged-In: Ibfcf212a4bc3094ca74f8f3c0f98469810c6ea19

2 files changed, 6 insertions, 87 deletions

diff --git a/TEST_MAPPING b/TEST_MAPPING
index fba7a0be70..2d46a53fe1 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -2264,57 +2264,6 @@
     },
     {
       "name": "art-run-test-963-default-range-smali"
-    },
-    {
-      "name": "art_standalone_cmdline_tests"
-    },
-    {
-      "name": "art_standalone_compiler_tests"
-    },
-    {
-      "name": "art_standalone_dex2oat_tests"
-    },
-    {
-      "name": "art_standalone_dexdump_tests"
-    },
-    {
-      "name": "art_standalone_dexlist_tests"
-    },
-    {
-      "name": "art_standalone_dexoptanalyzer_tests"
-    },
-    {
-      "name": "art_standalone_libartbase_tests"
-    },
-    {
-      "name": "art_standalone_libartpalette_tests"
-    },
-    {
-      "name": "art_standalone_libdexfile_support_tests"
-    },
-    {
-      "name": "art_standalone_libdexfile_tests"
-    },
-    {
-      "name": "art_standalone_libprofile_tests"
-    },
-    {
-      "name": "art_standalone_oatdump_tests"
-    },
-    {
-      "name": "art_standalone_odrefresh_tests"
-    },
-    {
-      "name": "art_standalone_profman_tests"
-    },
-    {
-      "name": "art_standalone_runtime_compiler_tests"
-    },
-    {
-      "name": "art_standalone_runtime_tests"
-    },
-    {
-      "name": "art_standalone_sigchain_tests"
     }
   ]
 }
diff --git a/test/utils/regen-test-files b/test/utils/regen-test-files
index 0341cf5cd7..588a2b02fb 100755
--- a/test/utils/regen-test-files
+++ b/test/utils/regen-test-files
@@ -462,34 +462,6 @@ presubmit_tests_percentage = 100
 # This value has to be a number between 0 and 100.
 mainline_presubmit_tests_percentage = 100
 
-# ART gtests that do not need root access to the device.
-art_gtest_user_module_names = [
-    "art_standalone_cmdline_tests",
-    "art_standalone_compiler_tests",
-    "art_standalone_dex2oat_tests",
-    "art_standalone_dexdump_tests",
-    "art_standalone_dexlist_tests",
-    "art_standalone_libartbase_tests",
-    "art_standalone_libartpalette_tests",
-    "art_standalone_libdexfile_support_tests",
-    "art_standalone_libdexfile_tests",
-    "art_standalone_libprofile_tests",
-    "art_standalone_oatdump_tests",
-    "art_standalone_odrefresh_tests",
-    "art_standalone_runtime_compiler_tests",
-    "art_standalone_runtime_tests",
-    "art_standalone_sigchain_tests",
-]
-
-# ART gtests that need root access to the device.
-art_gtest_eng_only_module_names = [
-    "art_standalone_dexoptanalyzer_tests",
-    "art_standalone_profman_tests",
-]
-
-# All supported ART gtests.
-art_gtest_module_names = sorted(art_gtest_user_module_names + art_gtest_eng_only_module_names)
-
 
 # Is `run_test` a Checker test (i.e. a test containing Checker
 # assertions)?
@@ -647,7 +619,7 @@ class Generator:
         "BootImageProfileTest",
     ]
     presubmit_run_tests = run_test_module_names[0:num_presubmit_run_tests]
-    presubmit_tests = other_presubmit_tests + presubmit_run_tests + art_gtest_module_names
+    presubmit_tests = other_presubmit_tests + presubmit_run_tests
     presubmit_tests_dict = [{"name": t} for t in presubmit_tests]
 
     # Postsubmits.
@@ -938,15 +910,13 @@ class Generator:
 
     print(f"Generated TEST_MAPPING entries for {len(expected_succeeding_tests)} ART run-tests out"
           f" of {len(run_tests)} ({expected_succeeding_tests_percentage}%):")
-    for (num_tests, test_kind, tests_percentage, test_group_name) in [
-        (num_mainline_presubmit_run_tests, "ART run-tests", mainline_presubmit_tests_percentage,
+    for (num_tests, tests_percentage, test_group_name) in [
+        (num_mainline_presubmit_run_tests, mainline_presubmit_tests_percentage,
          "mainline-presubmit"),
-        (num_presubmit_run_tests, "ART run-tests", presubmit_tests_percentage, "presubmit"),
-        (len(art_gtest_module_names), "ART gtests", 100, "presubmit"),
-        (num_postsubmit_tests, "ART run-tests", postsubmit_tests_percentage, "postsubmit"),
+        (num_presubmit_run_tests, presubmit_tests_percentage, "presubmit"),
+        (num_postsubmit_tests, postsubmit_tests_percentage, "postsubmit"),
     ]:
-      print(
-          f"  {num_tests:3d} {test_kind} ({tests_percentage}%) in `{test_group_name}` test group.")
+      print(f"  {num_tests} tests ({tests_percentage}%) in `{test_group_name}` test group.")
 
     # Regenerate ART MTS definition (optional).
     # -----------------------------------------