diff options
| author | 2019-07-05 16:32:41 +0100 | |
|---|---|---|
| committer | 2019-08-08 11:06:51 +0000 | |
| commit | 6461124331de7707f3b109cec38337d851be997e (patch) | |
| tree | 551fe08dc46d71f903244080f90df751d648adb5 /tools/common | |
| parent | 3cb59a4e22bff5a06f5bcd1deb86e2580dd36de3 (diff) | |
Remove icu .dat file from Runtime module
Bug: 137009149
Bug: 130295968
Test: device boots
Test: m out/target/common/obj/JAVA_LIBRARIES/ahat-test-dump_intermediates/test-dump.hprof
Test: art/build/apex/runtests.sh fails due to bug 138103882
Test: art/tools/buildbot-build.sh
Test: m test-art-host-gtest
Change-Id: I0501fd6dd02dac3cf9780f5f1c0103e4b0475e1f
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 4171dfed28..c80ebf513f 100755 --- a/tools/common/common.py +++ b/tools/common/common.py @@ -299,6 +299,7 @@ class HostTestEnv(ITestEnv): os.mkdir(arch_cache_path) 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.runtime' android_tzdata_root = android_root + '/com.android.tzdata' library_path = android_root + '/' + lib @@ -306,6 +307,7 @@ class HostTestEnv(ITestEnv): 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_I18N_ROOT'] = android_i18n_root self._shell_env['ANDROID_RUNTIME_ROOT'] = android_runtime_root self._shell_env['ANDROID_TZDATA_ROOT'] = android_tzdata_root self._shell_env['LD_LIBRARY_PATH'] = library_path |