Remove compact dex level plumbing from the test scripts and the tests

themselves.

dex2oat ignores --compact-dex-level since https://r.android.com/2736873.

Test: presubmits
Bug: 325430813
Change-Id: Ife6002aae2581613bd3f2a9a11a8f30bdf27fa4b

1 files changed, 1 insertions, 5 deletions

diff --git a/test/default_run.py b/test/default_run.py
index 5ae04304ad..25b94b3f09 100755
--- a/test/default_run.py
+++ b/test/default_run.py
@@ -45,7 +45,6 @@ def parse_args(argv):
   argp.add_argument("--bionic", action="store_true")
   argp.add_argument("--boot", default="")
   argp.add_argument("--chroot", default="")
-  argp.add_argument("--compact-dex-level")
   argp.add_argument("--compiler-only-option", default=[], action="append")
   argp.add_argument("--create-runner", action="store_true")
   argp.add_argument("--diff-min-log-tag", default="E")
@@ -372,9 +371,6 @@ def default_run(ctx, args, **kwargs):
     if arg == "-Xmethod-trace":
       # Method tracing can slow some tests down a lot.
       TIME_OUT_EXTRA += 1200
-  if args.compact_dex_level:
-    arg = args.compact_dex_level
-    COMPILE_FLAGS += f" --compact-dex-level={arg}"
   if JVMTI_REDEFINE_STRESS:
     # APP_IMAGE doesn't really work with jvmti redefine stress
     SECONDARY_APP_IMAGE = False
@@ -834,7 +830,7 @@ def default_run(ctx, args, **kwargs):
         # If no arguments need to be passed, just delete the odex file so that the runtime only picks up the vdex file.
         vdex_cmdline = f"rm {DEX_LOCATION}/oat/{ISA}/{name}.odex"
       else:
-        vdex_cmdline = f"{dex2oat_cmdline} {VDEX_ARGS} --compact-dex-level=none --input-vdex={DEX_LOCATION}/oat/{ISA}/{name}.vdex"
+        vdex_cmdline = f"{dex2oat_cmdline} {VDEX_ARGS} --input-vdex={DEX_LOCATION}/oat/{ISA}/{name}.vdex"
     elif TEST_DEX2OAT_DM:
       vdex_cmdline = f"{dex2oat_cmdline} {VDEX_ARGS} --dump-timings --dm-file={DEX_LOCATION}/oat/{ISA}/{name}.dm"
       dex2oat_cmdline = f"{dex2oat_cmdline} --copy-dex-files=false --output-vdex={DEX_LOCATION}/oat/{ISA}/primary.vdex"