Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d26e97e authored by Narayan Kamath's avatar Narayan Kamath Committed by Android Git Automerger
Browse files

am 3f1d1608: am 475a3d17: Merge "Use java_home to determine jdk location."

* commit '3f1d1608':
  Use java_home to determine jdk location.
parents 6a275202 3f1d1608
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -1407,7 +1407,7 @@ function set_java_home() {
      else
        case `uname -s` in
            Darwin)
                export JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk1.7.0_51.jdk/Contents/Home
                export JAVA_HOME=$(/usr/libexec/java_home -v 1.7)
                ;;
            *)
                export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64