SDK: Android: Changed mobile-impl.xml to avoid pre-dexing external jar files.

git-svn-id: http://jmonkeyengine.googlecode.com/svn/trunk@10541 75d07b2b-3a1a-0410-a2c5-0572b91ccdca

diff --git a/sdk/jme3-android/src/com/jme3/gde/android/mobile-targets.xml b/sdk/jme3-android/src/com/jme3/gde/android/mobile-targets.xml
index c1f741f..757ad7e 100644 (file)
--- a/sdk/jme3-android/src/com/jme3/gde/android/mobile-targets.xml
+++ b/sdk/jme3-android/src/com/jme3/gde/android/mobile-targets.xml
@@ -27,33 +27,37 @@
         <echo>Copying application libraries to android project.</echo>
         <delete dir="mobile/libs" failonerror="false"/>
         <mkdir dir="mobile/libs"/>
-        <copy todir="mobile/libs" verbose="false" flatten="true">
-            <fileset dir="dist/lib/">
-                <exclude name="${assets.jar.name}"/>
-                <exclude name="jME3-desktop.jar"/>
-                <exclude name="jME3-blender.jar"/>
-                <exclude name="jME3-lwjgl.jar"/>
-                <exclude name="jME3-lwjgl-natives.jar"/>
-                <exclude name="jME3-bullet-natives.jar"/>
-                <exclude name="jME3-jbullet.jar"/>
-                <exclude name="jME3-bullet.jar"/>
-                <exclude name="jbullet.jar"/>
-                <exclude name="stack-alloc.jar"/>
-                <exclude name="vecmath.jar"/>
-                <exclude name="lwjgl.jar"/>
-                <exclude name="jinput.jar"/>
-            </fileset>
-        </copy>
-
+        <antcall target="-copy-project-libs"/>
         <antcall target="-add-android-lib"/>
         <antcall target="-unzip-bullet-libs"/>
         <antcall target="-unzip-assets"/>
-        <copy file="${dist.jar}" todir="mobile/libs/" verbose="false"/>
+        <copy file="${dist.jar}" todir="mobile/libs/" verbose="false" preservelastmodified="true"/>
+    </target>
+
+    <target description="create mobile/libs directory and copy project libraries" name="-copy-project-libs">
+        <copy todir="mobile/libs" flatten="true" verbose="true" preservelastmodified="true">
+            <path>
+                <pathelement path="${run.classpath.without.build.classes.dir}"/>
+            </path>
+        </copy>
+        <delete file="mobile/libs/${assets.jar.name}"/>
+        <delete file="mobile/libs/jME3-desktop.jar"/>
+        <delete file="mobile/libs/jME3-blender.jar"/>
+        <delete file="mobile/libs/jME3-lwjgl.jar"/>
+        <delete file="mobile/libs/jME3-lwjgl-natives.jar"/>
+        <delete file="mobile/libs/jME3-bullet-natives.jar"/>
+        <delete file="mobile/libs/jME3-jbullet.jar"/>
+        <delete file="mobile/libs/jME3-bullet.jar"/>
+        <delete file="mobile/libs/jbullet.jar"/>
+        <delete file="mobile/libs/stack-alloc.jar"/>
+        <delete file="mobile/libs/vecmath.jar"/>
+        <delete file="mobile/libs/lwjgl.jar"/>
+        <delete file="mobile/libs/jinput.jar"/>
     </target>
 
     <target name="-add-android-lib">
         <echo>Adding libraries for android.</echo>
-        <copy todir="mobile/libs" flatten="true">
+        <copy todir="mobile/libs" flatten="true" preservelastmodified="true">
             <path>
                 <pathelement path="${libs.android-base.classpath}"/>
             </path>
@@ -62,7 +66,13 @@
 
     <target name="-unzip-bullet-libs" depends="-delete-bullet-libs" if="bulletIsIncluded">
         <echo>Replacing bullet library with android native version.</echo>
-        <unzip src="mobile/libs/jME3-bullet-natives-android.jar" dest="mobile/libs"/>
+
+        <!-- use copy with zipfileset to enable preserving the last modified date to avoid pre-dexing -->
+        <copy todir="mobile/libs" preservelastmodified="true">
+          <zipfileset src="mobile/libs/jME3-bullet-natives-android.jar">
+          </zipfileset>
+        </copy>
+
         <delete file="mobile/libs/jME3-bullet-natives-android.jar"/>
         <delete dir="mobile/libs/x86"/>
     </target>