diff options
| -rwxr-xr-x | test/etc/run-test-jar | 3 | ||||
| -rwxr-xr-x | test/run-test | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar index d61fc8f8fc..a02fe95ef4 100755 --- a/test/etc/run-test-jar +++ b/test/etc/run-test-jar @@ -476,11 +476,14 @@ if [ "$HOST" = "n" ]; then LD_LIBRARY_PATH=$ANDROID_ROOT/$LIBRARY_DIRECTORY fi + PUBLIC_LIBS=libart.so:libartd.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 # command. cmdline="cd $DEX_LOCATION && \ export ANDROID_DATA=$DEX_LOCATION && \ + export ANDROID_ADDITIONAL_PUBLIC_LIBRARIES=$PUBLIC_LIBS && \ export DEX_LOCATION=$DEX_LOCATION && \ export ANDROID_ROOT=$ANDROID_ROOT && \ $mkdir_cmdline && \ diff --git a/test/run-test b/test/run-test index fc57d0914f..ce8c010c54 100755 --- a/test/run-test +++ b/test/run-test @@ -467,7 +467,7 @@ elif [ "$runtime" = "art" ]; then run_args="${run_args} --runtime-option -Djava.library.path=${ANDROID_HOST_OUT}/lib${suffix64}" else guess_target_arch_name - run_args="${run_args} --runtime-option -Djava.library.path=/data/art-test/${target_arch_name}" + run_args="${run_args} --runtime-option -Djava.library.path=/data/art-test/${target_arch_name}:/system/lib${suffix64}" run_args="${run_args} --boot /data/art-test/core${image_suffix}${pic_image_suffix}${multi_image_suffix}.art" fi if [ "$relocate" = "yes" ]; then |