diff options
| -rwxr-xr-x | test/etc/run-test-jar | 3 | ||||
| -rwxr-xr-x | test/run-test | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar index 186a1513ee..5ef645c6c5 100755 --- a/test/etc/run-test-jar +++ b/test/etc/run-test-jar @@ -589,7 +589,8 @@ if [ "$HOST" = "n" ]; then LD_LIBRARY_PATH=$ANDROID_ROOT/$LIBRARY_DIRECTORY:$LD_LIBRARY_PATH fi - PUBLIC_LIBS=libart.so:libartd.so + # System libraries needed by libarttestd.so + PUBLIC_LIBS=libart.so:libartd.so:libc++.so:libbacktrace.so:libbase.so:libnativehelper.so # Create a script with the command. The command can get longer than the longest # allowed adb command and there is no way to get the exit status from a adb shell diff --git a/test/run-test b/test/run-test index 27c700e89e..7bf7b30b40 100755 --- a/test/run-test +++ b/test/run-test @@ -495,7 +495,7 @@ elif [ "$runtime" = "art" ]; then run_args="${run_args} --runtime-option -Djava.library.path=${ANDROID_HOST_OUT}/lib${suffix64}:${ANDROID_HOST_OUT}/nativetest${suffix64}" else guess_target_arch_name - run_args="${run_args} --runtime-option -Djava.library.path=/data/nativetest${suffix64}/art/${target_arch_name}:${android_root}/lib${suffix64}" + run_args="${run_args} --runtime-option -Djava.library.path=/data/nativetest${suffix64}/art/${target_arch_name}" run_args="${run_args} --boot /data/art-test/core${image_suffix}${pic_image_suffix}${multi_image_suffix}.art" fi if [ "$relocate" = "yes" ]; then |