diff options
| -rw-r--r-- | test/testrunner/target_config.py | 9 | ||||
| -rwxr-xr-x | tools/build_linux_bionic_tests.sh | 5 |
2 files changed, 7 insertions, 7 deletions
diff --git a/test/testrunner/target_config.py b/test/testrunner/target_config.py index b1878133f0..077129fa6c 100644 --- a/test/testrunner/target_config.py +++ b/test/testrunner/target_config.py @@ -331,10 +331,9 @@ target_config = { }, 'art-linux-bionic-x64': { 'build': '{ANDROID_BUILD_TOP}/art/tools/build_linux_bionic_tests.sh {MAKE_OPTIONS}', - # Currently failing on the build-bots due to some library search path issue. - # 'run-test': ['--run-test-option=--bionic', - # '--host', - # '--64', - # '--no-build-dependencies'], + 'run-test': ['--run-test-option=--bionic', + '--host', + '--64', + '--no-build-dependencies'], }, } diff --git a/tools/build_linux_bionic_tests.sh b/tools/build_linux_bionic_tests.sh index 3ee7d506aa..2b178f2cff 100755 --- a/tools/build_linux_bionic_tests.sh +++ b/tools/build_linux_bionic_tests.sh @@ -29,6 +29,7 @@ fi source build/envsetup.sh >&/dev/null # for get_build_var out_dir=$(get_build_var OUT_DIR) +host_out=$(get_build_var HOST_OUT) # TODO(b/31559095) Figure out a better way to do this. # @@ -80,8 +81,8 @@ bionic_targets=( $soong_out/bin/hiddenapi $soong_out/bin/hprof-conv $soong_out/bin/timeout_dumper - $(find $ANDROID_HOST_OUT/lib64 -type f | sed "s:$ANDROID_HOST_OUT:$soong_out:g") - $(find $ANDROID_HOST_OUT/nativetest64 -type f | sed "s:$ANDROID_HOST_OUT:$soong_out:g")) + $(find $host_out/lib64 -type f | sed "s:$host_out:$soong_out:g") + $(find $host_out/nativetest64 -type f | sed "s:$host_out:$soong_out:g")) echo building ${bionic_targets[*]} |