mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2024-11-09 20:44:03 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix Issue 50, not building on Windows, by adding some small workarounds for Windows paths in build files for Android

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@363 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2008-04-16 00:34:13 +00:00
parent d2a240220c
commit aa5cdcb64b
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
android-m3/build.xml
View file

@ -42,7 +42,7 @@
<!-- Intermediate files -->
<property name="dex-file" value="classes.dex"/>
<property name="intermediate-dex" value="${outdir}/${dex-file}"/>
<property name="intermediate-dex" location="${outdir}/${dex-file}"/>
<!-- The final package file to generate -->
<property name="out-package" value="${outdir}/BarcodeReader.apk"/>
@ -50,7 +50,11 @@
<!-- Tools -->
<property name="aapt" value="${android-tools}/aapt"/>
<property name="aidl" value="${android-tools}/aidl"/>
<property name="dx" value="${android-tools}/dx"/>
<!-- dx is a special case as it is a .bat file on Windows -->
<condition property="dx" value="${android-tools}/dx.bat" else="${android-tools}/dx">
<os family="windows"/>
</condition>
<property name="zip" value="zip"/>
<property name="android-jar" value="${sdk-folder}/android.jar"/>
@ -175,7 +179,6 @@
</condition>
<exec executable="${dx}" failonerror="true">
<arg value="-JXmx384M"/>
<arg value="--dex"/>
<arg value="--optimize"/>
<arg value="--output=${intermediate-dex}"/>

8
android/build.xml
View file

@ -42,7 +42,7 @@
<!-- Intermediate files -->
<property name="dex-file" value="classes.dex"/>
<property name="intermediate-dex" value="${outdir}/${dex-file}"/>
<property name="intermediate-dex" location="${outdir}/${dex-file}"/>
<!-- The final package file to generate -->
<property name="out-package" value="${outdir}/BarcodeReader.apk"/>
@ -50,7 +50,10 @@
<!-- Tools -->
<property name="aapt" value="${android-tools}/aapt"/>
<property name="aidl" value="${android-tools}/aidl"/>
<property name="dx" value="${android-tools}/dx"/>
<!-- dx is a special case as it is a .bat file on Windows -->
<condition property="dx" value="${android-tools}/dx.bat" else="${android-tools}/dx">
<os family="windows"/>
</condition>
<property name="adb" value="${android-tools}/adb" />
<property name="android-jar" value="${sdk-folder}/android.jar" />
<property name="zip" value="zip"/>
@ -173,7 +176,6 @@
</condition>
<exec executable="${dx}" failonerror="true">
<arg value="-JXmx384M"/>
<arg value="--dex"/>
<arg value="--output=${intermediate-dex}"/>
<arg value="--locals=${locals}"/>