diff options
| author | 2017-11-08 09:20:20 +0000 | |
|---|---|---|
| committer | 2017-11-08 09:20:20 +0000 | |
| commit | db9f630e2396f1dd0f640b10253230cf966cc526 (patch) | |
| tree | 1bc56327fc202e4931281a5b2a7dfb370d601556 /test/testrunner/env.py | |
| parent | 3b7ce4ecc6994ea73022c1c4d2df7a3f4fc7471c (diff) | |
| parent | 18085acd2430b8ccb5f397a8f3f8a81d11fa94cf (diff) | |
Merge "Revert "Move ART tests to use D8.""
Diffstat (limited to 'test/testrunner/env.py')
| -rw-r--r-- | test/testrunner/env.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/testrunner/env.py b/test/testrunner/env.py index 92cc977f01..55569629ea 100644 --- a/test/testrunner/env.py +++ b/test/testrunner/env.py @@ -35,7 +35,7 @@ _DUMP_MANY_VARS_LIST = ['HOST_2ND_ARCH_PREFIX', 'HOST_OUT_EXECUTABLES', 'ANDROID_JAVA_TOOLCHAIN', 'ANDROID_COMPILE_WITH_JACK', - 'USE_D8'] + 'USE_D8_BY_DEFAULT'] _DUMP_MANY_VARS = None # To be set to a dictionary with above list being the keys, # and the build variable being the value. def _dump_many_vars(var_name): @@ -109,7 +109,7 @@ ANDROID_BUILD_TOP = _get_android_build_top() ANDROID_COMPILE_WITH_JACK = _get_build_var_boolean('ANDROID_COMPILE_WITH_JACK', 'default') # Follow the build system's D8 usage. -USE_D8 = _get_build_var_boolean('USE_D8', False) +USE_D8_BY_DEFAULT = _get_build_var_boolean('USE_D8_BY_DEFAULT', False) # Directory used for temporary test files on the host. ART_HOST_TEST_DIR = tempfile.mkdtemp(prefix = 'test-art-') |