summaryrefslogtreecommitdiffstats
path: root/make/build.xml
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2011-08-05 05:11:36 +0200
committerSven Gothel <[email protected]>2011-08-05 05:11:36 +0200
commit0afee4288c9f95450292ca2f2ec9170b93f64830 (patch)
tree0aca5a4b778d8ea951eab9448dd04d4bad90b081 /make/build.xml
parent847d4d93f28423d9f4bc1f3c4e02c936f90d0798 (diff)
aapt.signed: add androidresources.path argument ; sdk >= 9 ; test uses-library com.jogamp.common
Diffstat (limited to 'make/build.xml')
-rw-r--r--make/build.xml4
1 files changed, 3 insertions, 1 deletions
diff --git a/make/build.xml b/make/build.xml
index e5d5a15..b4f74a5 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -693,7 +693,7 @@
</copy>
</target>
- <target name="android.package" depends="gluegen.cpptasks.detect.os,gluegen.build.check.java" if="isAndroid">
+ <target name="android.package" depends="gluegen.cpptasks.detect.os,gluegen.build.check.java" if="isAndroid" unless="gluegen.build.skip.java" >
<aapt.signed
jarbuilddir="${build}"
@@ -701,6 +701,7 @@
nativebuilddir="${gluegen.lib.dir}"
nativebasename="gluegen-rt"
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}" />
@@ -711,6 +712,7 @@
nativebuilddir="${gluegen.lib.dir}"
nativebasename="gluegen-rt"
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}" />