From 48581e36773e58e20a3e780caf5b1c29b4805285 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Tue, 3 Apr 2012 18:37:24 +0200
Subject: Ant Build: Split 2nd pass in android and non-android builds. The
 former uses the Android API JAR for android specifics.

---
 make/build-common.xml |  7 +++++++
 make/build-jogl.xml   | 23 +++++++++++++++++++++--
 2 files changed, 28 insertions(+), 2 deletions(-)

(limited to 'make')

diff --git a/make/build-common.xml b/make/build-common.xml
index dfe38a676..1ac6f701a 100644
--- a/make/build-common.xml
+++ b/make/build-common.xml
@@ -422,6 +422,13 @@
             <path refid="nativewindow_all_atoms.classpath" />
         </path>
 
+        <path id="android_nativewindow_gluegen.classpath">
+            <pathelement location="${android.jar}" />
+            <pathelement location="${gluegen-rt.jar}" />
+            <pathelement location="${swt.jar}" />
+            <path refid="nativewindow_all_atoms.classpath" />
+        </path>
+
         <!-- NEWT Compilation .. -->
         <path id="jogl_nativewindow_gluegen.classpath">
             <pathelement location="${android.jar}" />
diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index ace272b74..68888c830 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -1043,7 +1043,7 @@
         </javac>
     </target>
 
-    <target name="java.compile.secondpass.javase">
+    <target name="java.compile.secondpass.javase" unless="isAndroid">
         <!-- Perform the second pass Java compile; everything except portion of fixed function emulation depending on generated code. -->
         <javac destdir="${classes}"
                excludes="com/jogamp/opengl/util/glsl/fixedfunc/FixedFuncUtil.java,${java.excludes.all}"
@@ -1061,7 +1061,26 @@
         </javac>
     </target>
 
-    <target name="java.compile.secondpass" depends="java.generate.composable.pipeline, java.compile.secondpass.javase" />
+    <target name="java.compile.secondpass.android" if="isAndroid">
+        <!-- Perform the second pass Java compile; everything except portion of fixed function emulation depending on generated code. -->
+        <javac destdir="${classes}"
+               excludes="com/jogamp/opengl/util/glsl/fixedfunc/FixedFuncUtil.java,${java.excludes.all}"
+               fork="yes"
+               includeAntRuntime="false"
+               memoryMaximumSize="${javac.memorymax}"
+               encoding="UTF-8"
+               source="${target.sourcelevel}" 
+               target="${target.targetlevel}" 
+               bootclasspath="${target.rt.jar}"
+               debug="${javacdebug}" debuglevel="${javacdebuglevel}">
+            <classpath refid="android_nativewindow_gluegen.classpath"/>
+            <src path="${src.java}" />
+            <src path="${src.generated.java}" />
+        </javac>
+    </target>
+
+        <!-- Perform the second pass Java compile; everything except portion of fixed function emulation depending on generated code. -->
+    <target name="java.compile.secondpass" depends="java.generate.composable.pipeline, java.compile.secondpass.javase, java.compile.secondpass.android" />
 
     <target name="java.compile.thirdpass.javase">
         <!-- Perform the third pass Java compile; everything including fixed function emulation. -->
-- 
cgit v1.2.3