From 64d17fc39efcfff0f8187b2b8a1c433520dc2973 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Wed, 9 May 2012 15:04:44 +0200
Subject: Fix Android AAPT Task/Macro: Put temp src/classes folder (R.java)
 aside image folder ..

.. so they are not included in the APK. Including them in the APK causes
Google market/play to use both as platform filters (0 devices if no native folder is present).
---
 make/jogamp-androidtasks.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'make/jogamp-androidtasks.xml')

diff --git a/make/jogamp-androidtasks.xml b/make/jogamp-androidtasks.xml
index 64becda..f37e42c 100644
--- a/make/jogamp-androidtasks.xml
+++ b/make/jogamp-androidtasks.xml
@@ -74,10 +74,10 @@
         <delete file="${m.aapt.release.file.name}" includeEmptyDirs="true" quiet="true" failonerror="false" />
         <delete dir="${m.aapt.build.apk}" includeEmptyDirs="true" quiet="true" failonerror="false" />
 
+        <mkdir dir="${m.aapt.build.apk}/temp/src" />
+        <mkdir dir="${m.aapt.build.apk}/temp/classes" />
         <mkdir dir="${m.aapt.build.apk}/image/assets" />
         <mkdir dir="${m.aapt.build.apk}/image/lib/@{android.abi}" />
-        <mkdir dir="${m.aapt.build.apk}/image/lib/src" />
-        <mkdir dir="${m.aapt.build.apk}/image/lib/classes" />
         <copy todir="${m.aapt.build.apk}/image/lib/@{android.abi}">
             <fileset dir="@{nativebuilddir}">
                 <include name="*@{nativebasename}*.${native.library.suffix}" />
@@ -110,7 +110,7 @@
             <arg line="-I"/>
             <arg line="${android.jar}"/>
             <arg line="-J"/>
-            <arg line="${m.aapt.build.apk}/image/lib/src"/>
+            <arg line="${m.aapt.build.apk}/temp/src"/>
         </exec>
 
         <echo>aapt.signed @{jarbasename}: compiling R.java...</echo>
@@ -119,9 +119,9 @@
             target="${target.targetlevel}" 
             bootclasspath="${target.rt.jar}"
             debug="false" extdirs=""
-            destdir="${m.aapt.build.apk}/image/lib/classes"
+            destdir="${m.aapt.build.apk}/temp/classes"
             verbose="true">
-            <src path="${m.aapt.build.apk}/image/lib/src" />
+            <src path="${m.aapt.build.apk}/temp/src" />
             <classpath>
                  <!-- path refid="@{jarclasspathrefid}"/-->
                  <pathelement location="@{jarbuilddir}/@{jarbasename}.jar" />
@@ -134,7 +134,7 @@
             <arg line="--dex"/>
             <arg line="--output=${m.aapt.dex.file}"/>
             <arg line="@{jarbuilddir}/@{jarbasename}.jar"/>
-            <arg line="${m.aapt.build.apk}/image/lib/classes"/>
+            <arg line="${m.aapt.build.apk}/temp/classes"/>
         </exec>
         
         <path id="android.antlibs">
-- 
cgit v1.2.3