diff options
| author | 2018-11-23 17:56:43 +0000 | |
|---|---|---|
| committer | 2018-12-03 20:05:09 +0000 | |
| commit | 26c43778589d1c7598cbe6203b6545c9d3ab220a (patch) | |
| tree | 474167d306678366b1c90c7a9e6f824308ec7f7a /tools/common | |
| parent | c89a28730fb8dff57c6cb5b18295fec45fe85d09 (diff) | |
Add support for ANDROID_RUNTIME_ROOT variable
This commit introduces the ANDROID_RUNTIME_ROOT environment
variable in preparation for its use within the runtime module.
As a module, ART must no longer use the Android-wide
ANDROID_ROOT environment variable as the base of default
paths for module content. ANDROID_RUNTIME_ROOT will take over
the responsibility. It remains a variable to unify host
and device treatment.
Some test methods (SetUpAndroidData, TearDownAndroidData
SetUpAndroidRoot) have been renamed to clarify their purpose.
Bug: 119935277
Test: build / treehugger
Change-Id: I7c7de52911cbfa56cef90270425ed369176c4767
Diffstat (limited to 'tools/common')
| -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']) |