diff options
| author | Sven Gothel <[email protected]> | 2012-03-07 03:58:56 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2012-03-07 03:58:56 +0100 |
| commit | 238a669b5163e76d79dcf298b3c63381821e01ba (patch) | |
| tree | 12c0225a1aae3cac7a161300590bdba9fa58a030 /make | |
| parent | be3c68fada7cf9503f3d501d29283628e0056bcb (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')
| -rw-r--r-- | make/build-test.xml | 2 | ||||
| -rw-r--r-- | make/build.xml | 14 | ||||
| -rw-r--r-- | make/scripts/adb-uninstall-all.sh | 1 |
3 files changed, 9 insertions, 8 deletions
diff --git a/make/build-test.xml b/make/build-test.xml index 9f8ef25..e52ad4a 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -86,7 +86,7 @@ </path> <property name="junit.run.jars" value="${junit.jar}${path.separator}${ant.jar}${path.separator}${TestJarsInJar.jar}${path.separator}${gluegen.root}/${rootrel.build}/gluegen.jar${path.separator}${build_t}/gluegen-test.jar"/> <property name="junit.run.remote.jars" value="${junit.jar}${path.separator}${env.TARGET_ANT_HOME}/lib/ant.jar${path.separator}${env.TARGET_ANT_HOME}/lib/ant-junit.jar${path.separator}${gluegen.root}/make/lib/TestJarsInJar.jar${path.separator}${gluegen.root}/${rootrel.build}/gluegen.jar${path.separator}${build_t}/gluegen-test.jar"/> - <property name="junit.run.remote.apks" value="${ant-junit-all.apk}${path.separator}${gluegen.root}/${rootrel.build}/gluegen.apk${path.separator}${build_t}/gluegen-test.apk${path.separator}${gluegen.root}/make/lib/TestJarsInJar.apk"/> + <property name="junit.run.remote.apks" value="${ant-junit-all.apk}${path.separator}${gluegen.root}/${rootrel.build}/gluegen-rt.apk${path.separator}${build_t}/gluegen-test.apk${path.separator}${gluegen.root}/make/lib/TestJarsInJar.apk"/> <property name="stub.includes.dir" value="stub_includes" /> <!-- NOTE: this MUST be relative for FileSet --> 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> diff --git a/make/scripts/adb-uninstall-all.sh b/make/scripts/adb-uninstall-all.sh new file mode 100644 index 0000000..9973ef4 --- /dev/null +++ b/make/scripts/adb-uninstall-all.sh @@ -0,0 +1 @@ +adb uninstall com.jogamp.common |