diff options
Diffstat (limited to 'make/build.xml')
| -rw-r--r-- | make/build.xml | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/make/build.xml b/make/build.xml index 4a7341f..f91d3a2 100644 --- a/make/build.xml +++ b/make/build.xml @@ -682,26 +682,20 @@ </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" /> + <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" /> - <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/"/> + <arg line="${build}/gluegen-rt.jar"/> + <!-- CHECK HOW TO LOAD NATIVE LIBS FROM APK.. arg line="${build}/gluegen-rt-natives-${os.and.arch}.jar"/--> </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" /> + <delete file="${build}/gluegen.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"/> + <arg line="--output=${build}/gluegen.apk"/> + <arg line="${build}/gluegen.jar"/> + <!-- CHECK HOW TO LOAD NATIVE LIBS FROM APK.. arg line="${build}/gluegen-rt-natives-${os.and.arch}.jar"/ --> </exec> </target> |