diff options
| author | Sven Gothel <[email protected]> | 2011-07-24 11:37:45 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2011-07-24 11:37:45 +0200 |
| commit | 869c49c22573147c94b1e6d931c2cff696a54a47 (patch) | |
| tree | 882779724e74c324de714bbc6f8c2f88e5492862 /make/build.xml | |
| parent | 9f45b6f09cbce6c7889e099939656356befa585d (diff) | |
Android integration / cross-test ; Enhance Platform
- android minor build fix
- started dex'ing (gluegen-rt.apk, more to come for full junit tests)
- android remote dalvikvm launch works (crosstest-java-android-armv7-rel.sh)
- android detection, incl version (reflection)
- Platform:
- Add JAVA_VM_NAME and JAVA_VM_RUNIME
- OSType maybe ANDROID, where the OS name (String) is Linux ! (ok ?)
Diffstat (limited to 'make/build.xml')
| -rw-r--r-- | make/build.xml | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/make/build.xml b/make/build.xml index 28767b5..4a7341f 100644 --- a/make/build.xml +++ b/make/build.xml @@ -680,12 +680,35 @@ <replacestring from="GLUEGEN_CODEBASE_TAG" to="${gluegen.jnlp.codebase}"/> </filterchain> </copy> - + </target> + + <target name="android.package.p1" depends="gluegen.cpptasks.detect.os,gluegen.build.check.java" if="isAndroid"> + <delete dir="${build}/gluegen-rt.d" includeEmptyDirs="true" quiet="true" failonerror="false" /> + <delete file="${build}/gluegen-rt.apk" includeEmptyDirs="true" quiet="true" failonerror="false" /> + <mkdir dir="${build}/gluegen-rt.d" /> + <exec dir="${build}/gluegen-rt.d" executable="unzip" logError="true" failonerror="true" failifexecutionfails="true"> + <arg line="../gluegen-rt.jar"/> + </exec> + <exec dir="." executable="dx" logError="true" failonerror="true" failifexecutionfails="true"> + <arg line="--dex"/> + <arg line="--output=${build}/gluegen-rt.apk"/> + <arg line="${build}/gluegen-rt.d/"/> + </exec> + </target> + + <target name="android.package" depends="gluegen.cpptasks.detect.os,gluegen.build.check.java" if="isAndroid"> + <delete file="${build}/gluegen-rt.apk" includeEmptyDirs="true" quiet="true" failonerror="false" /> + <exec dir="." executable="dx" logError="true" failonerror="true" failifexecutionfails="true"> + <arg line="--dex"/> + <arg line="--output=${build}/gluegen-rt.apk"/> + <arg line="${build}/gluegen-rt.jar"/> + </exec> </target> <target name="base.compile" depends="init, gluegen.build.java, gluegen.build.c, tag.build" /> - <target name="all" description="Release build" depends="init, base.compile, junit.compile, developer-zip-archive" /> + <target name="all.no_junit" description="Release build" depends="init, base.compile, android.package, developer-zip-archive" /> + <target name="all" description="Release build" depends="init, base.compile, junit.compile, android.package, developer-zip-archive" /> <target name="all.debug" description="Debug build" depends="init.debug, base.compile, junit.compile, developer-zip-archive" /> |