From 3310c43bcf8a06ba7576c7747dffdcf0c1f586aa Mon Sep 17 00:00:00 2001
From: Jeff Williams <jeffsmessages@gmail.com>
Date: Fri, 7 Aug 2020 08:05:48 -0400
Subject: [PATCH] Make find_linux_jnih more robust.

---
 scripts/find_linux_jnih | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/scripts/find_linux_jnih b/scripts/find_linux_jnih
index 546d03b..ef4a95a 100755
--- a/scripts/find_linux_jnih
+++ b/scripts/find_linux_jnih
@@ -1,8 +1,14 @@
 #!/bin/bash
 
-JAVA_HOME=$(dirname $(readlink -f $(which java) | sed 's^jre/bin/^^'))
+if [ -z ${JAVA_HOME+x} ]
+then
+  # JAVA_HOME not set. Figure out what to use for it.
+  JAVA_HOME=$(dirname $(readlink -f $(which java) | sed 's^jre/bin/^^'))
+  # Handle the case where java is being run from the jdk itself, not from within the jre
+  JAVA_HOME=$(echo $JAVA_HOME | sed 's^bin/^^')
+fi
 
-echo // +build linux > jni_linux.tmp
+echo // +build linux,!android > jni_linux.tmp
 echo //Generated by scripts/find_linux_jnih >> jni_linux.tmp
 echo >> jni_linux.tmp
 echo package jni >> jni_linux.tmp