From 1c1afd5712ccda50da302d58fbc5b20c23799ca1 Mon Sep 17 00:00:00 2001
From: "nor..67" <normen667@gmail.com>
Date: Sun, 26 Aug 2012 12:13:08 +0000
Subject: [PATCH] - add fix for Android SDK 20 build file flaw

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9687 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
---
 .../gde/android/MobileCompositeProvider.java  |  2 +-
 .../com/jme3/gde/android/mobile-targets.xml   | 20 +++++++++++++------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/sdk/jme3-android/src/com/jme3/gde/android/MobileCompositeProvider.java b/sdk/jme3-android/src/com/jme3/gde/android/MobileCompositeProvider.java
index fda2af75e..e7fc9a52f 100644
--- a/sdk/jme3-android/src/com/jme3/gde/android/MobileCompositeProvider.java
+++ b/sdk/jme3-android/src/com/jme3/gde/android/MobileCompositeProvider.java
@@ -57,7 +57,7 @@ public class MobileCompositeProvider implements ProjectCustomizer.CompositeCateg
     private class SavePropsListener implements ActionListener {
 
         private String extensionName = "mobile";
-        private String extensionVersion = "v0.17";
+        private String extensionVersion = "v0.18";
         private String[] extensionDependencies = new String[]{"jar", "-mobile-deployment"};
         private ProjectExtensionManager manager = new ProjectExtensionManager(extensionName, extensionVersion, extensionDependencies);
         private ProjectExtensionProperties properties;
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 e25016ea6..860c0bddf 100644
--- a/sdk/jme3-android/src/com/jme3/gde/android/mobile-targets.xml
+++ b/sdk/jme3-android/src/com/jme3/gde/android/mobile-targets.xml
@@ -2,27 +2,35 @@
         <os family="windows" />
     </condition>
     
-    <target name="run-android" depends="-flag-no-android, jar, -test-android-enabled, -copy-android-libs" if="is.android.enabled">
+        <target name="run-android" depends="-flag-no-android, jar, -test-android-enabled, -copy-android-libs" if="is.android.enabled">
         <echo>Building debug android application version.</echo>
-        <ant dir="mobile" target="debug"/>
+        <ant dir="mobile" target="debug">
+            <property name="manifest.abs.file" location="mobile/AndroidManifest.xml"/>
+        </ant>
         <antcall target="-start-android-device"/>
-        <ant dir="mobile" target="installd"/>
+        <ant dir="mobile" target="installd">
+            <property name="manifest.abs.file" location="mobile/AndroidManifest.xml"/>
+        </ant>
         <antcall target="-run-android-device"/>
     </target>
     
     <target name="clean-android">
-        <ant dir="mobile" target="clean"/>
+        <ant dir="mobile" target="clean">
+            <property name="manifest.abs.file" location="mobile/AndroidManifest.xml"/>
+        </ant>
     </target>
     
     <target name="-mobile-deployment" depends="-test-android-enabled, -copy-android-libs" if="is.android.enabled" unless="no.android.build">
-        <ant dir="mobile" target="release"/>
+        <ant dir="mobile" target="release">
+            <property name="manifest.abs.file" location="mobile/AndroidManifest.xml"/>
+        </ant>
         <copy todir="dist" verbose="false" flatten="true">
             <fileset dir="mobile/bin/">
                 <include name="**/*.apk"/>
             </fileset>
         </copy>
     </target>
-    
+
     <target name="-copy-android-libs" if="is.android.enabled">
         <echo>Copying application libraries to android project.</echo>
         <delete dir="mobile/libs" failonerror="false"/>