From 4a1cac420b34cc23458742e0deb67116b69b93eb Mon Sep 17 00:00:00 2001 From: Orion Hodson Date: Wed, 23 May 2018 16:23:27 +0100 Subject: ART: Remove jack from test Test: art/test.py --host Change-Id: I31b0c0d57d344f54a8c0545fd32c81a893b4ec75 --- test/testrunner/env.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'test/testrunner/env.py') diff --git a/test/testrunner/env.py b/test/testrunner/env.py index 0c1c308218..66ed0d0004 100644 --- a/test/testrunner/env.py +++ b/test/testrunner/env.py @@ -68,9 +68,6 @@ def _get_android_build_top(): ANDROID_BUILD_TOP = _get_android_build_top() -# Compiling with jack? Possible values in (True, False, 'default') -ANDROID_COMPILE_WITH_JACK = _get_build_var_boolean('ANDROID_COMPILE_WITH_JACK', 'default') - # Directory used for temporary test files on the host. ART_HOST_TEST_DIR = tempfile.mkdtemp(prefix = 'test-art-') @@ -134,8 +131,8 @@ else: HOST_OUT_EXECUTABLES = os.path.join(ANDROID_BUILD_TOP, _get_build_var("HOST_OUT_EXECUTABLES")) -# Set up default values for $JACK, $DX, $SMALI, etc to the $HOST_OUT_EXECUTABLES/$name path. -for tool in ['jack', 'dx', 'smali', 'jasmin', 'd8']: +# Set up default values for $DX, $SMALI, etc to the $HOST_OUT_EXECUTABLES/$name path. +for tool in ['dx', 'smali', 'jasmin', 'd8']: os.environ.setdefault(tool.upper(), HOST_OUT_EXECUTABLES + '/' + tool) ANDROID_JAVA_TOOLCHAIN = os.path.join(ANDROID_BUILD_TOP, -- cgit v1.2.3-59-g8ed1b