Browse Source

- change fix for Android SDK 20 build file flaw

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9688 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
nor..67 13 years ago
parent
commit
2e780f45ee
1 changed files with 5 additions and 13 deletions
  1. 5 13
      jme3-android/src/com/jme3/gde/android/mobile-targets.xml

+ 5 - 13
jme3-android/src/com/jme3/gde/android/mobile-targets.xml

@@ -2,28 +2,20 @@
         <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">
-            <property name="manifest.abs.file" location="mobile/AndroidManifest.xml"/>
-        </ant>
+        <ant dir="mobile" target="debug" inheritall="false"/>
         <antcall target="-start-android-device"/>
-        <ant dir="mobile" target="installd">
-            <property name="manifest.abs.file" location="mobile/AndroidManifest.xml"/>
-        </ant>
+        <ant dir="mobile" target="installd" inheritall="false"/>
         <antcall target="-run-android-device"/>
     </target>
     
     <target name="clean-android">
-        <ant dir="mobile" target="clean">
-            <property name="manifest.abs.file" location="mobile/AndroidManifest.xml"/>
-        </ant>
+        <ant dir="mobile" target="clean" inheritall="false"/>
     </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">
-            <property name="manifest.abs.file" location="mobile/AndroidManifest.xml"/>
-        </ant>
+        <ant dir="mobile" target="release" inheritall="false"/>
         <copy todir="dist" verbose="false" flatten="true">
             <fileset dir="mobile/bin/">
                 <include name="**/*.apk"/>