summaryrefslogtreecommitdiffstats
path: root/make/build.xml
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2012-03-07 03:58:56 +0100
committerSven Gothel <[email protected]>2012-03-07 03:58:56 +0100
commit238a669b5163e76d79dcf298b3c63381821e01ba (patch)
tree12c0225a1aae3cac7a161300590bdba9fa58a030 /make/build.xml
parentbe3c68fada7cf9503f3d501d29283628e0056bcb (diff)
Don't build and use gluegen.apk (compile time only) ; Don't test classloader -> JarURL on Android
All [remaining] tests passed on Android!
Diffstat (limited to 'make/build.xml')
-rw-r--r--make/build.xml14
1 files changed, 7 insertions, 7 deletions
diff --git a/make/build.xml b/make/build.xml
index 484dae4..eb34305 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -729,11 +729,10 @@
<target name="gluegen.build.check.aapt" depends="init">
<uptodate property="gluegen.build.skip.aapt">
- <srcfiles dir= "." includes="*.xml"/>
- <srcfiles dir= "${src.java}" includes="**"/>
- <srcfiles dir= "${c.grammar}" includes="**/*.g"/>
- <srcfiles dir= "${j.grammar}" includes="**/*.g"/>
- <mapper type="merge" to="${build}/gluegen.apk"/>
+ <srcfiles dir= "." includes="*.xml"/>
+ <srcfiles dir= "${src.java}" includes="**"/>
+ <srcfiles dir= "${src.generated}" includes="**"/>
+ <mapper type="merge" to="${build}/gluegen-rt.apk"/>
</uptodate>
</target>
@@ -752,7 +751,8 @@
version.name="${gluegen.version.plus}"
/>
- <aapt.signed
+ <!-- No need for a GlueGen Compile Time library on Android -->
+ <!-- aapt.signed
jarbuilddir="${build}"
jarbasename="gluegen"
nativebuilddir="${gluegen.lib.dir}"
@@ -763,7 +763,7 @@
jarmanifest.path="${build}/Manifest.temp"
version.code="${gluegen_int_version}"
version.name="${gluegen.version.plus}"
- />
+ /-->
</target>