Move test/etc/default_run.py one directory up.

Also merge in the single use of apex_bootclasspath_utils.

This removes the awkwardly named etc/ directory.

Test: test.py -b -r --all-target --optimizing --64
Change-Id: I79a752cb3c2da4d50a6fc4c26e58056dc9224d0c

1 files changed, 0 insertions, 82 deletions

diff --git a/test/etc/apex_bootclasspath_utils.py b/test/etc/apex_bootclasspath_utils.py
deleted file mode 100755
index d2415e5d3d..0000000000
--- a/test/etc/apex_bootclasspath_utils.py
+++ /dev/null
@@ -1,82 +0,0 @@
-#
-# Copyright (C) 2022 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# This file contains utils for constructing -Xbootclasspath and -Xbootclasspath-location
-# for dex2oat and dalvikvm from apex modules list.
-#
-# Those utils could be used outside of art/test/ to run ART in chroot setup.
-
-import os, sys
-
-# Note: This must start with the CORE_IMG_JARS in Android.common_path.mk
-# because that's what we use for compiling the boot.art image.
-# It may contain additional modules from TEST_CORE_JARS.
-bpath_modules = ("core-oj core-libart okhttp bouncycastle apache-xml core-icu4j"
-                 " conscrypt")
-
-
-# Helper function to construct paths for apex modules (for both -Xbootclasspath and
-# -Xbootclasspath-location).
-#
-#  Arguments.
-#   ${1}: path prefix.
-def get_apex_bootclasspath_impl(bpath_prefix: str):
-  bpath_separator = ""
-  bpath = ""
-  bpath_jar = ""
-  for bpath_module in bpath_modules.split(" "):
-    apex_module = "com.android.art"
-    if bpath_module == "conscrypt":
-      apex_module = "com.android.conscrypt"
-    if bpath_module == "core-icu4j":
-      apex_module = "com.android.i18n"
-    bpath_jar = f"/apex/{apex_module}/javalib/{bpath_module}.jar"
-    bpath += f"{bpath_separator}{bpath_prefix}{bpath_jar}"
-    bpath_separator = ":"
-  return bpath
-
-
-# Gets a -Xbootclasspath paths with the apex modules.
-#
-#  Arguments.
-#   ${1}: host (y|n).
-def get_apex_bootclasspath(host: bool):
-  bpath_prefix = ""
-
-  if host:
-    bpath_prefix = os.environ["ANDROID_HOST_OUT"]
-
-  return get_apex_bootclasspath_impl(bpath_prefix)
-
-
-# Gets a -Xbootclasspath-location paths with the apex modules.
-#
-#  Arguments.
-#   ${1}: host (y|n).
-def get_apex_bootclasspath_locations(host: bool):
-  bpath_location_prefix = ""
-
-  if host:
-    ANDROID_BUILD_TOP=os.environ["ANDROID_BUILD_TOP"]
-    ANDROID_HOST_OUT=os.environ["ANDROID_HOST_OUT"]
-    if ANDROID_HOST_OUT[0:len(ANDROID_BUILD_TOP)+1] == f"{ANDROID_BUILD_TOP}/":
-      bpath_location_prefix=ANDROID_HOST_OUT[len(ANDROID_BUILD_TOP)+1:]
-    else:
-      print(f"ANDROID_BUILD_TOP/ is not a prefix of ANDROID_HOST_OUT"\
-            "\nANDROID_BUILD_TOP={ANDROID_BUILD_TOP}"\
-            "\nANDROID_HOST_OUT={ANDROID_HOST_OUT}")
-      sys.exit(1)
-
-  return get_apex_bootclasspath_impl(bpath_location_prefix)