From e58624f221b967553d7b71f14d8677ceaa000553 Mon Sep 17 00:00:00 2001 From: Martin Stjernholm Date: Fri, 20 Sep 2019 15:53:40 +0100 Subject: Various renames following the name change from "Runtime APEX" to "ART APEX". In particular ANDROID_RUNTIME_ROOT is now ANDROID_ART_ROOT. Test: Build & boot Test: art/tools/run-gtests.sh in chroot Test: art/test/testrunner/testrunner.py --target --64 in chroot Test: art/tools/run-libcore-tests.sh --mode=device --variant=X64 in chroot Test: art/tools/run-jdwp-tests.sh --mode=device --variant=X64 in chroot Test: m test-art-host-gtest Test: art/test/testrunner/testrunner.py --host --64 Test: art/tools/run-jdwp-tests.sh --mode=host Bug: 135753770 Change-Id: Ia74da964e54cf396d66e9e12ea56da4e9483662a --- tools/common/common.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools/common/common.py') diff --git a/tools/common/common.py b/tools/common/common.py index 93b014ab10..fc9d879aa9 100755 --- a/tools/common/common.py +++ b/tools/common/common.py @@ -300,7 +300,7 @@ class HostTestEnv(ITestEnv): lib = 'lib64' if x64 else 'lib' android_root = GetEnvVariableOrError('ANDROID_HOST_OUT') android_i18n_root = android_root + '/com.android.i18n' - android_runtime_root = android_root + '/com.android.art' + android_art_root = android_root + '/com.android.art' android_tzdata_root = android_root + '/com.android.tzdata' library_path = android_root + '/' + lib path = android_root + '/bin' @@ -308,7 +308,7 @@ class HostTestEnv(ITestEnv): self._shell_env['ANDROID_DATA'] = self._env_path self._shell_env['ANDROID_ROOT'] = android_root self._shell_env['ANDROID_I18N_ROOT'] = android_i18n_root - self._shell_env['ANDROID_RUNTIME_ROOT'] = android_runtime_root + self._shell_env['ANDROID_ART_ROOT'] = android_art_root self._shell_env['ANDROID_TZDATA_ROOT'] = android_tzdata_root self._shell_env['LD_LIBRARY_PATH'] = library_path self._shell_env['DYLD_LIBRARY_PATH'] = library_path -- cgit v1.2.3-59-g8ed1b