diff options
| author | 2018-05-24 10:44:05 +0000 | |
|---|---|---|
| committer | 2018-05-24 10:44:05 +0000 | |
| commit | bb7cd233a5096166315827c066f5ab1d2b3e459f (patch) | |
| tree | 9f8cde8c7b94b14b5597a3c8e7b9a0e641437201 /test/testrunner/env.py | |
| parent | d804b76c0b8f9d2c94f3a8648aba26254742a1e2 (diff) | |
| parent | 4a1cac420b34cc23458742e0deb67116b69b93eb (diff) | |
Merge "ART: Remove jack from test"
Diffstat (limited to 'test/testrunner/env.py')
| -rw-r--r-- | test/testrunner/env.py | 7 |
1 files changed, 2 insertions, 5 deletions
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, |