diff options
| author | 2018-12-04 12:39:16 +0000 | |
|---|---|---|
| committer | 2018-12-04 12:39:16 +0000 | |
| commit | 807e4b30b3384e5b23da0c54710be78f17fc6345 (patch) | |
| tree | cb000ac70bffe89a907e1b63f0b58db3d8b6c4b7 /tools/common/common.py | |
| parent | 147b5b1ab58abcc25b4c2b489ee9952d0ce70c69 (diff) | |
| parent | 26c43778589d1c7598cbe6203b6545c9d3ab220a (diff) | |
Merge "Add support for ANDROID_RUNTIME_ROOT variable"
Diffstat (limited to 'tools/common/common.py')
| -rwxr-xr-x | tools/common/common.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/common/common.py b/tools/common/common.py index b728e8d927..6206dfb118 100755 --- a/tools/common/common.py +++ b/tools/common/common.py @@ -299,11 +299,13 @@ 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' 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['LD_LIBRARY_PATH'] = library_path self._shell_env['DYLD_LIBRARY_PATH'] = library_path self._shell_env['PATH'] = (path + ':' + self._shell_env['PATH']) |