diff options
Diffstat (limited to 'tools/common/common.py')
| -rwxr-xr-x | tools/common/common.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/common/common.py b/tools/common/common.py index 4171dfed28..fc9d879aa9 100755 --- a/tools/common/common.py +++ b/tools/common/common.py @@ -299,14 +299,16 @@ class HostTestEnv(ITestEnv): os.mkdir(arch_cache_path) lib = 'lib64' if x64 else 'lib' android_root = GetEnvVariableOrError('ANDROID_HOST_OUT') - android_runtime_root = android_root + '/com.android.runtime' + android_i18n_root = android_root + '/com.android.i18n' + 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' self._shell_env = os.environ.copy() self._shell_env['ANDROID_DATA'] = self._env_path self._shell_env['ANDROID_ROOT'] = android_root - self._shell_env['ANDROID_RUNTIME_ROOT'] = android_runtime_root + self._shell_env['ANDROID_I18N_ROOT'] = android_i18n_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 |