Cleanup toolhelper
Remove now unused method and corresponding constants in utils
Bug: 300387869
Change-Id: I12da52d6deb05d04a087ae897c09817ec557f9b4
diff --git a/tools/toolhelper.py b/tools/toolhelper.py
index f08fd49..ab912c8 100644
--- a/tools/toolhelper.py
+++ b/tools/toolhelper.py
@@ -76,29 +76,6 @@
time_consumer(duration)
return result
-def run_in_tests(tool, args, build=None, debug=True, extra_args=None):
- if build is None:
- build, args = extract_build_from_args(args)
- if build:
- gradle.RunGradle([
- 'copyMavenDeps',
- 'compileTestJava',
- ])
- cmd = []
- cmd.append(jdk.GetJavaExecutable())
- if extra_args:
- cmd.extend(extra_args)
- if debug:
- cmd.append('-ea')
- cmd.extend(['-cp', ':'.join([
- utils.BUILD_MAIN_DIR,
- utils.BUILD_TEST_DIR,
- ] + glob.glob('%s/*.jar' % utils.BUILD_DEPS_DIR))])
- cmd.extend([tool])
- cmd.extend(args)
- utils.PrintCmd(cmd)
- return subprocess.call(cmd)
-
def extract_build_from_args(input_args):
build = True
args = []
diff --git a/tools/utils.py b/tools/utils.py
index 4b07b6f..bcb0d4f 100644
--- a/tools/utils.py
+++ b/tools/utils.py
@@ -29,11 +29,9 @@
ANDROID_SDK = os.path.join(THIRD_PARTY, 'android_sdk')
MEMORY_USE_TMP_FILE = 'memory_use.tmp'
DEX_SEGMENTS_RESULT_PATTERN = re.compile('- ([^:]+): ([0-9]+)')
+
BUILD = os.path.join(REPO_ROOT, 'build')
-BUILD_DEPS_DIR = os.path.join(BUILD, 'deps')
-BUILD_MAIN_DIR = os.path.join(BUILD, 'classes', 'main')
BUILD_JAVA_MAIN_DIR = os.path.join(BUILD, 'classes', 'java', 'main')
-BUILD_TEST_DIR = os.path.join(BUILD, 'classes', 'test')
LIBS = os.path.join(BUILD, 'libs')
CUSTOM_CONVERSION_DIR = os.path.join(
THIRD_PARTY, 'openjdk', 'custom_conversion')
