1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
|
--- plpo/libjogl2-java-2.0-rc3/make/build-newt.xml 2011-10-06 15:52:37.000000000 +0200
+++ libjogl2-java-2.0-rc3/make//build-newt.xml 2011-10-06 18:55:54.000000000 +0200
@@ -139,7 +139,7 @@
<isset property="setup.noOpenGL"/>
</condition>
- <property name="java.excludes.all" value="${java.excludes.awt}, ${java.excludes.opengl}" />
+ <property name="java.excludes.all" value="${java.excludes.awt}, ${java.excludes.opengl} jogamp/newt/driver/android/**" />
<echo message="java.excludes.all: ${java.excludes.all}" />
</target>
@@ -575,7 +575,7 @@
<javah destdir="${src.generated.c}/X11" classpath="${javah.classpath}" class="jogamp.newt.driver.x11.X11Window" />
<javah destdir="${src.generated.c}/X11" classpath="${javah.classpath}" class="jogamp.newt.driver.x11.X11Screen" />
<javah destdir="${src.generated.c}/X11" classpath="${javah.classpath}" class="jogamp.newt.driver.x11.X11Display" />
- <javah destdir="${src.generated.c}/Android" classpath="${javah.classpath}:${android.jar}" class="jogamp.newt.driver.android.AndroidWindow" />
+<!-- <javah destdir="${src.generated.c}/Android" classpath="${javah.classpath}:${android.jar}" class="jogamp.newt.driver.android.AndroidWindow" />-->
</target>
<target name="c.build.newt.windowlib" unless="setup.nonatives">
--- plpo/libjogl2-java-2.0-rc3/make/build-test.xml 2011-10-06 15:52:37.000000000 +0200
+++ libjogl2-java-2.0-rc3/make//build-test.xml 2011-10-06 19:02:13.000000000 +0200
@@ -78,12 +78,14 @@
</target>
<target name="test.compile" depends="test.compile.check" unless="test.compile.skip">
+ <property name="java.excludes.all" value="jogamp/newt/driver/android/** com/jogamp/opengl/test/android/**" />
<!-- Perform the junit pass Java compile -->
<javac destdir="${classes}"
source="${host.sourcelevel}"
fork="yes"
memoryMaximumSize="${javac.memorymax}"
includeAntRuntime="false"
+ excludes="${java.excludes.all}"
debug="${javacdebug}" debuglevel="${javacdebuglevel}">
<classpath refid="junit_jogl_newt_android.compile.classpath"/>
<src path="${src.test}" />
|
