diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2014-10-31 15:50:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-10-31 15:50:19 +0000 |
| commit | 57b4d1c44e246dfd4aaef2d23b20a696a0c5e57e (patch) | |
| tree | 35d524b85b7544e023c3a3de01ae99a7775b06a0 | |
| parent | f6e59f57d0c0cbbbe64d6862507350e4853495cd (diff) | |
| parent | eb441dd9a3e78c00900bad57e93e464ad70d22b3 (diff) | |
| download | art-57b4d1c44e246dfd4aaef2d23b20a696a0c5e57e.tar.gz art-57b4d1c44e246dfd4aaef2d23b20a696a0c5e57e.tar.bz2 art-57b4d1c44e246dfd4aaef2d23b20a696a0c5e57e.zip | |
Merge "Fix armv8 testing with default ANDROID_ROOT."
| -rwxr-xr-x | test/etc/run-test-jar | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar index 39f28c877..9ecc885a6 100755 --- a/test/etc/run-test-jar +++ b/test/etc/run-test-jar @@ -305,6 +305,14 @@ if [ "$HOST" = "n" ]; then adb push $TEST_NAME-ex.jar $DEX_LOCATION >/dev/null 2>&1 fi + LD_LIBRARY_PATH= + if [ "$ANDROID_ROOT" != "/system" ]; then + # Current default installation is dalvikvm 64bits and dex2oat 32bits, + # so we can only use LD_LIBRARY_PATH when testing on a local + # installation. + LD_LIBRARY_PATH=$ANDROID_ROOT/$LIBRARY_DIRECTORY + fi + # 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. @@ -312,7 +320,7 @@ if [ "$HOST" = "n" ]; then export ANDROID_DATA=$DEX_LOCATION && \ export DEX_LOCATION=$DEX_LOCATION && \ export ANDROID_ROOT=$ANDROID_ROOT && \ - export LD_LIBRARY_PATH=$ANDROID_ROOT/$LIBRARY_DIRECTORY && \ + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH && \ $mkdir_cmdline && \ $dex2oat_cmdline && \ $dalvikvm_cmdline" |