From 625727ee75b758bef4f9f5f3816b37547c9f6875 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Sun, 24 Jul 2011 22:04:40 +0200
Subject: Cleaned up android build ; Cross junit/java android test/script; Fix
 Test1p2ProcAddressEmitter

Fix Test1p2ProcAddressEmitter
  - 3 tests used the wrong binding instance,
    where no native lib was loaded for - duh :)

Cleaned up android build
  - add unix src (UnixDynamicLinkerImpl_JNI.c)
  - remove linker cmds in compile arguments

Cross junit/java android test works via script
    - target command scrip is written to file, pushed and executed

Status: com.jogamp.gluegen.test.junit.generation.Test1p2ProcAddressEmitter
    - passed
    - on par w/ linux-armv7
---
 make/build.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'make/build.xml')

diff --git a/make/build.xml b/make/build.xml
index f91d3a2..b1b8616 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -302,6 +302,10 @@
       <property name="java.includes.dir.platform"           value="${java.includes.dir}/linux" />
     </target>
 
+    <target name="declare.android" if="isAndroid" >
+      <property name="c.src.dir.os"                         value="unix" />
+    </target>
+
     <target name="declare.solaris32" if="isSolaris32Bit">
       <echo message="Solaris" />
       <property name="compiler.cfg.id"                      value="compiler.cfg.solaris" /> 
@@ -359,7 +363,7 @@
       <property name="java.includes.dir.hpux"               value="${java.includes.dir}/hp-ux" />
     </target>
 
-    <target name="c.configure" depends="gluegen.cpptasks.detect.os,gluegen.cpptasks.setup.compiler,declare.win32,declare.linux,declare.solaris,declare.macosx,declare.freebsd,declare.hpux,gluegen.cpptasks.configure.compiler" unless="build.javaonly" />
+    <target name="c.configure" depends="gluegen.cpptasks.detect.os,gluegen.cpptasks.setup.compiler,declare.win32,declare.linux,declare.android,declare.solaris,declare.macosx,declare.freebsd,declare.hpux,gluegen.cpptasks.configure.compiler" unless="build.javaonly" />
 
     <target name="c.rename.lib.mingw" if="isMingW">
       <!-- FIXME: this is a hack; the cpptask should have an option to change the
-- 
cgit v1.2.3