From 0afee4288c9f95450292ca2f2ec9170b93f64830 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Fri, 5 Aug 2011 05:11:36 +0200
Subject: aapt.signed: add androidresources.path argument ; sdk >= 9 ; test
 uses-library com.jogamp.common

---
 make/build.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'make/build.xml')

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}" />
-- 
cgit v1.2.3