Fix for compiling with sdk 0.9

simpligility · Sep 4, 2008 · 711aeba · 711aeba
1 parent 0d808f6
commit 711aeba
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/install.bat b/install.bat
@@ -1 +1 @@
-mvn install:install-file -Dfile=%ANDROID_SDK%\android.jar -DgeneratePom=true -DgroupId=android -DartifactId=android -Dversion=m5-rc15 -Dpackaging=jar
+mvn install:install-file -Dfile="%ANDROID_SDK%\android.jar" -DgeneratePom=true -DgroupId=android -DartifactId=android -Dversion=0.9_beta -Dpackaging=jar
diff --git a/maven-aapt-plugin/src/main/java/org/jvending/masa/plugin/aapt/AaptCompilerMojo.java b/maven-aapt-plugin/src/main/java/org/jvending/masa/plugin/aapt/AaptCompilerMojo.java
@@ -59,7 +59,7 @@ public class AaptCompilerMojo extends AbstractMojo {
     private ArtifactFactory artifactFactory;
 
     /**
-     * @parameter default-value = "m5-rc15"
+     * @parameter default-value = "0.9_beta"
      */
     private String androidVersion;
 
@@ -101,7 +101,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
         File androidJar = new File(localRepository, defaultLayout.pathOf(artifact));
 
         List<String> commands = new ArrayList<String>();
-        commands.add("compile");
+        commands.add("package");
         if (createPackageDirectories) {
             commands.add("-m");
         }

diff --git a/maven-aapt-plugin/src/main/java/org/jvending/masa/plugin/aapt/AaptPackagerMojo.java b/maven-aapt-plugin/src/main/java/org/jvending/masa/plugin/aapt/AaptPackagerMojo.java
@@ -57,7 +57,7 @@ public class AaptPackagerMojo extends AbstractMojo {
     private File localRepository;
 
     /**
-     * @parameter default-value = "m5-rc15"
+     * @parameter default-value = "0.9_beta"
      */
     private String androidVersion;
 
@@ -105,7 +105,6 @@ public void execute() throws MojoExecutionException, MojoFailureException {
         List<String> commands = new ArrayList<String>();
         commands.add("package");
         commands.add("-f");
-        commands.add("-c");
         commands.add("-M");
         commands.add(androidManifestFile.getAbsolutePath());
         if (resourceDirectory.exists()) {
@@ -114,6 +113,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
         }
         commands.add("-I");
         commands.add(androidJar.getAbsolutePath());
+        commands.add("-F");
         commands.add(tmpOutputFile.getAbsolutePath());
         getLog().info("aapt " + commands.toString());
         try {