commit 9417650bdfa66ecee688f940852a6c126a93716a
author Vladimir Marko <vmarko@google.com> Wed Mar 07 15:07:38 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 07 15:07:38 2018 +0000
tree a5ce1ec9cbb7d1521416e225bb632c74021ab63a
parent 84debf7c65a9cbba81ebea9aef22126eb2a7e4eb
parent 2da72ed76edca8818191fb59386cdefde5049d30

Merge "ART: Do not load wrong libart(d)/libdexfile(d).so for tests."

test/etc/run-test-jar

diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar
index 43684f8..86adb73 100755
--- a/test/etc/run-test-jar
+++ b/test/etc/run-test-jar
@@ -865,7 +865,12 @@
     fi
 
     # System libraries needed by libarttestd.so
-    PUBLIC_LIBS=libart.so:libartd.so:libc++.so:libbacktrace.so:libdexfile.so:libdexfiled.so:libbase.so:libnativehelper.so
+    PUBLIC_LIBS=libc++.so:libbacktrace.so:libbase.so:libnativehelper.so
+    if [ "$TEST_IS_NDEBUG" = "y" ]; then
+      PUBLIC_LIBS=$PUBLIC_LIBS:libart.so:libdexfile.so
+    else
+      PUBLIC_LIBS=$PUBLIC_LIBS:libartd.so:libdexfiled.so
+    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