Bug 1363: Java 11: Adopt java.lib.dir.platform changes to make/lib/gluegen-cpptasks-*

4 files changed, 20 insertions, 4 deletions

diff --git a/make/lib/gluegen-cpptasks-android-aarch64.xml b/make/lib/gluegen-cpptasks-android-aarch64.xml
index 90805a1..1daa201 100644
--- a/make/lib/gluegen-cpptasks-android-aarch64.xml
+++ b/make/lib/gluegen-cpptasks-android-aarch64.xml
@@ -126,8 +126,12 @@
   <echo message="Custom forced Linux.x86 cross compile android" />
   <property name="compiler.cfg.id.base"          value="compiler.cfg.android" /> 
   <property name="linker.cfg.id.base"            value="linker.cfg.android" /> 
-  <property name="java.lib.dir.platform"         value="${java.home.dir}/jre/lib/i386" />
   <property name="java.includes.dir.platform"    value="${java.includes.dir}/x11" />
+  <available property="java.lib.dir.platform"    value="${java.home.dir}/jre/lib/i386" 
+                                                  file="${java.home.dir}/jre/lib/i386/libjava.so"/>
+  <available property="java.lib.dir.platform"    value="${java.home.dir}/lib/i386"     
+                                                  file="${java.home.dir}/lib/i386/libjava.so"/>
+  <property name="java.lib.dir.platform"         value="${java.home.dir}/lib"/> <!-- new default -->
 </target>
 
 <target name="declare.linux.android">
diff --git a/make/lib/gluegen-cpptasks-android-armv6.xml b/make/lib/gluegen-cpptasks-android-armv6.xml
index c7e2c83..738c70d 100644
--- a/make/lib/gluegen-cpptasks-android-armv6.xml
+++ b/make/lib/gluegen-cpptasks-android-armv6.xml
@@ -128,8 +128,12 @@
   <echo message="Custom forced Linux.x86 cross compile android" />
   <property name="compiler.cfg.id.base"          value="compiler.cfg.android" /> 
   <property name="linker.cfg.id.base"            value="linker.cfg.android" /> 
-  <property name="java.lib.dir.platform"         value="${java.home.dir}/jre/lib/i386" />
   <property name="java.includes.dir.platform"    value="${java.includes.dir}/x11" />
+  <available property="java.lib.dir.platform"    value="${java.home.dir}/jre/lib/i386" 
+                                                  file="${java.home.dir}/jre/lib/i386/libjava.so"/>
+  <available property="java.lib.dir.platform"    value="${java.home.dir}/lib/i386"     
+                                                  file="${java.home.dir}/lib/i386/libjava.so"/>
+  <property name="java.lib.dir.platform"         value="${java.home.dir}/lib"/> <!-- new default -->
 </target>
 
 <target name="declare.linux.android">
diff --git a/make/lib/gluegen-cpptasks-android-x86.xml b/make/lib/gluegen-cpptasks-android-x86.xml
index 04cbb2c..7fbd44e 100644
--- a/make/lib/gluegen-cpptasks-android-x86.xml
+++ b/make/lib/gluegen-cpptasks-android-x86.xml
@@ -117,8 +117,12 @@
   <echo message="Custom forced Linux.x86 cross compile android" />
   <property name="compiler.cfg.id.base"          value="compiler.cfg.android" /> 
   <property name="linker.cfg.id.base"            value="linker.cfg.android" /> 
-  <property name="java.lib.dir.platform"         value="${java.home.dir}/jre/lib/i386" />
   <property name="java.includes.dir.platform"    value="${java.includes.dir}/linux" />
+  <available property="java.lib.dir.platform"    value="${java.home.dir}/jre/lib/i386" 
+                                                  file="${java.home.dir}/jre/lib/i386/libjava.so"/>
+  <available property="java.lib.dir.platform"    value="${java.home.dir}/lib/i386"     
+                                                  file="${java.home.dir}/lib/i386/libjava.so"/>
+  <property name="java.lib.dir.platform"         value="${java.home.dir}/lib"/> <!-- new default -->
 </target>
 
 <target name="declare.linux.android">
diff --git a/make/lib/gluegen-cpptasks-linux-32bit.xml b/make/lib/gluegen-cpptasks-linux-32bit.xml
index 025c0fa..ad79c25 100644
--- a/make/lib/gluegen-cpptasks-linux-32bit.xml
+++ b/make/lib/gluegen-cpptasks-linux-32bit.xml
@@ -43,8 +43,12 @@
   -->
   <property name="compiler.cfg.id.base"          value="compiler.cfg.linux" /> 
   <property name="linker.cfg.id.base"            value="linker.cfg.linux" /> 
-  <property name="java.lib.dir.platform"         value="${java.home.dir}/jre/lib/i386" />
   <property name="java.includes.dir.platform"    value="${java.includes.dir}/x11" />
+  <available property="java.lib.dir.platform"    value="${java.home.dir}/jre/lib/i386" 
+                                                  file="${java.home.dir}/jre/lib/i386/libjava.so"/>
+  <available property="java.lib.dir.platform"    value="${java.home.dir}/lib/i386"     
+                                                  file="${java.home.dir}/lib/i386/libjava.so"/>
+  <property name="java.lib.dir.platform"         value="${java.home.dir}/lib"/> <!-- new default -->
 </target>
 
 </project>