sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- add fix for Android SDK 20 build file flaw

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9687 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
nor..67 2012-08-26 12:13:08 +00:00
parent a98fbb83b6
commit 1c1afd5712
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sdk/jme3-android/src/com/jme3/gde/android/MobileCompositeProvider.java
View File

@ -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;

16
sdk/jme3-android/src/com/jme3/gde/android/mobile-targets.xml
View File

@ -4,18 +4,26 @@
<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"/>