aboutsummaryrefslogtreecommitdiffstats
path: root/make/lib/gluegen-cpptasks-android-armv6.xml
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2019-08-18 17:58:14 +0200
committerSven Gothel <[email protected]>2019-08-18 17:58:14 +0200
commit175392ceeba5f69aa5ac90e4021490ade742a323 (patch)
tree9cc93533d812074ee21a93acca275d37d610f800 /make/lib/gluegen-cpptasks-android-armv6.xml
parent0f370707ed27dff495c5d091d284f7a006cb28a0 (diff)
Bug 1363: Java 11: Adopt java.lib.dir.platform changes to make/lib/gluegen-cpptasks-*
Diffstat (limited to 'make/lib/gluegen-cpptasks-android-armv6.xml')
-rw-r--r--make/lib/gluegen-cpptasks-android-armv6.xml6
1 files changed, 5 insertions, 1 deletions
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">