summaryrefslogtreecommitdiffstats
path: root/make/build.xml
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2012-03-06 11:00:02 +0100
committerSven Gothel <[email protected]>2012-03-06 11:00:02 +0100
commitbb698e7d5157857c728c11ffc46f0cd2ff79b345 (patch)
treef6d1058d754f89542e34b6d6cf0254c999a51893 /make/build.xml
parentb78966195b2dca68b4aa971651005a787e62a54f (diff)
parentd51d2aaad01d1c8188193a7913c6ef0fc38ea798 (diff)
Merge branch 'pulled'
Diffstat (limited to 'make/build.xml')
-rw-r--r--make/build.xml8
1 files changed, 6 insertions, 2 deletions
diff --git a/make/build.xml b/make/build.xml
index c0e5c8c..01a989a 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -751,22 +751,26 @@
jarbasename="gluegen-rt"
nativebuilddir="${gluegen.lib.dir}"
nativebasename="gluegen-rt"
+ android.abi="${android.abi}"
androidmanifest.path="resources/android/AndroidManifest-Runtime.xml"
androidresources.path="resources/android/res"
jarmanifest.path="${build}/Manifest-rt.temp"
version.code="${gluegen_int_version}"
- version.name="${gluegen.version.plus}" />
+ version.name="${gluegen.version.plus}"
+ />
<aapt.signed
jarbuilddir="${build}"
jarbasename="gluegen"
nativebuilddir="${gluegen.lib.dir}"
nativebasename="gluegen-rt"
+ android.abi="${android.abi}"
androidmanifest.path="resources/android/AndroidManifest-CompileTime.xml"
androidresources.path="resources/android/res"
jarmanifest.path="${build}/Manifest.temp"
version.code="${gluegen_int_version}"
- version.name="${gluegen.version.plus}" />
+ version.name="${gluegen.version.plus}"
+ />
</target>