From 02641c4d08853a1e0131336968f691fde8a30043 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Thu, 28 Jul 2011 08:07:29 +0200
Subject: APK: Native lib gets picked up now apk/lib/armeabi ->
 /data/data/<package>/lib

---
 make/jogamp-androidtasks.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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

diff --git a/make/jogamp-androidtasks.xml b/make/jogamp-androidtasks.xml
index 5bfd708..d07d6bc 100644
--- a/make/jogamp-androidtasks.xml
+++ b/make/jogamp-androidtasks.xml
@@ -61,10 +61,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}/image/bin/lib/armeabi" />
-        <mkdir dir="${m.aapt.build.apk}/image/bin/lib/src" />
-        <mkdir dir="${m.aapt.build.apk}/image/bin/lib/assets" />
-        <copy todir="${m.aapt.build.apk}/image/bin/lib/armeabi">
+        <mkdir dir="${m.aapt.build.apk}/image/lib/armeabi" />
+        <mkdir dir="${m.aapt.build.apk}/image/lib/src" />
+        <mkdir dir="${m.aapt.build.apk}/image/lib/assets" />
+        <copy todir="${m.aapt.build.apk}/image/lib/armeabi">
             <fileset dir="@{nativebuilddir}">
                 <include name="*@{nativebasename}*.${native.library.suffix}" />
             </fileset>
@@ -101,7 +101,7 @@
             <arg value="lib/android/res"/>
 
             <arg line="-A" />
-            <arg value="${m.aapt.build.apk}/image/bin/lib/assets"/> <!-- FIXME: Should assets be in out lib/android/assets ?? -->
+            <arg value="${m.aapt.build.apk}/image/lib/assets"/> <!-- FIXME: Should assets be in out lib/android/assets ?? -->
 
             <arg line="-I" />
             <arg value="${env.ANDROID_SDK_HOME}/platforms/android-${env.ANDROID_SDK_VERSION}/android.jar"/>
-- 
cgit v1.2.3