commit f7694610fb6cc44bc411696aea7788af620fbb95
author Nicolas Geoffray <ngeoffray@google.com> Tue Nov 29 22:06:50 2016 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Wed Nov 30 12:59:25 2016 +0000
tree c07142ea503459078645c76d82d0a93cfceaaccc
parent c23d5e478365914f08477b7aca151a140e063b55

Don't call realpath on a file that may not exist.

Otherwise realpath prints an error message.

bug: 25658944
Change-Id: I63145c3d955e088e53708d8c6add945e6eab6654

tools/art

diff --git a/tools/art b/tools/art
index 1394a46..91d6e27 100644
--- a/tools/art
+++ b/tools/art
@@ -30,8 +30,9 @@
 }
 
 function find_libdir() {
+  # Get the actual file, $DALVIKVM may be a symbolic link.
   # Use realpath instead of readlink because Android does not have a readlink.
-  if [ "$(realpath "$ANDROID_ROOT/bin/$DALVIKVM")" = "$(realpath "$ANDROID_ROOT/bin/dalvikvm64")" ]; then
+  if [[ "$(realpath "$ANDROID_ROOT/bin/$DALVIKVM")" == *dalvikvm64 ]]; then
     echo "lib64"
   else
     echo "lib"