auto import from //branches/cupcake/...@132569

20 files changed, 1230 insertions, 305 deletions

diff --git a/anttasks/.classpath b/anttasks/.classpath
index 08ced21..d6ce15a 100644
--- a/anttasks/.classpath
+++ b/anttasks/.classpath
@@ -4,5 +4,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/SdkLib"/>
 	<classpathentry kind="var" path="ANDROID_SRC/prebuilt/common/ant/ant.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/ApkBuilder"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/anttasks/src/Android.mk b/anttasks/src/Android.mk
index dbaf2bc..94d6d3f 100644
--- a/anttasks/src/Android.mk
+++ b/anttasks/src/Android.mk
@@ -20,6 +20,7 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files)
 
 LOCAL_JAVA_LIBRARIES := \
         sdklib \
+        apkbuilder \
         ant
 
 LOCAL_MODULE := anttasks
diff --git a/anttasks/src/com/android/ant/AaptExecLoopTask.java b/anttasks/src/com/android/ant/AaptExecLoopTask.java
new file mode 100644
index 0000000..d2c7162
--- /dev/null
+++ b/anttasks/src/com/android/ant/AaptExecLoopTask.java
@@ -0,0 +1,218 @@
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.ant;
+
+import com.android.sdklib.project.ApkConfigurationHelper;
+import com.android.sdklib.project.ProjectProperties;
+import com.android.sdklib.project.ProjectProperties.PropertyType;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.taskdefs.ExecTask;
+import org.apache.tools.ant.types.Path;
+
+import java.io.File;
+import java.util.Map;
+import java.util.Set;
+import java.util.Map.Entry;
+
+/**
+ * Task able to run an Exec task on aapt several times.
+ * It does not follow the exec task format, instead it has its own parameters, which maps
+ * directly to aapt.
+ *
+ */
+public final class AaptExecLoopTask extends Task {
+    
+    private String mExecutable;
+    private String mCommand;
+    private String mManifest;
+    private String mResources;
+    private String mAssets;
+    private String mAndroidJar;
+    private String mOutFolder;
+    private String mBaseName;
+
+    /**
+     * Sets the value of the "executable" attribute.
+     * @param executable the value.
+     */
+    public void setExecutable(String executable) {
+        mExecutable = executable;
+    }
+    
+    /**
+     * Sets the value of the "command" attribute.
+     * @param command the value.
+     */
+    public void setCommand(String command) {
+        mCommand = command;
+    }
+    
+    /**
+     * Sets the value of the "manifest" attribute.
+     * @param manifest the value.
+     */
+    public void setManifest(Path manifest) {
+        mManifest = manifest.toString();
+    }
+    
+    /**
+     * Sets the value of the "resources" attribute.
+     * @param resources the value.
+     */
+    public void setResources(Path resources) {
+        mResources = resources.toString();
+    }
+    
+    /**
+     * Sets the value of the "assets" attribute.
+     * @param assets the value.
+     */
+    public void setAssets(Path assets) {
+        mAssets = assets.toString();
+    }
+    
+    /**
+     * Sets the value of the "androidjar" attribute.
+     * @param androidJar the value.
+     */
+    public void setAndroidjar(Path androidJar) {
+        mAndroidJar = androidJar.toString();
+    }
+    
+    /**
+     * Sets the value of the "outfolder" attribute.
+     * @param outFolder the value.
+     */
+    public void setOutfolder(Path outFolder) {
+        mOutFolder = outFolder.toString();
+    }
+    
+    /**
+     * Sets the value of the "basename" attribute.
+     * @param baseName the value.
+     */
+    public void setBasename(String baseName) {
+        mBaseName = baseName;
+    }
+    
+    /*
+     * (non-Javadoc)
+     * 
+     * Executes the loop. Based on the values inside default.properties, this will
+     * create alternate temporary ap_ files.
+     * 
+     * @see org.apache.tools.ant.Task#execute()
+     */
+    @Override
+    public void execute() throws BuildException {
+        Project taskProject = getProject();
+        
+        // first do a full resource package
+        createPackage(null /*configName*/, null /*resourceFilter*/);
+
+        // now see if we need to create file with filtered resources.
+        // Get the project base directory.
+        File baseDir = taskProject.getBaseDir();
+        ProjectProperties properties = ProjectProperties.load(baseDir.getAbsolutePath(),
+                PropertyType.DEFAULT);
+        
+        Map<String, String> apkConfigs = ApkConfigurationHelper.getConfigs(properties);
+        if (apkConfigs.size() > 0) {
+            Set<Entry<String, String>> entrySet = apkConfigs.entrySet();
+            for (Entry<String, String> entry : entrySet) {
+                createPackage(entry.getKey(), entry.getValue());
+            }
+        }
+    }
+
+    /**
+     * Creates a resource package.
+     * @param configName the name of the filter config. Can be null in which case a full resource
+     * package will be generated.
+     * @param resourceFilter the resource configuration filter to pass to aapt (if configName is
+     * non null)
+     */
+    private void createPackage(String configName, String resourceFilter) {
+        Project taskProject = getProject();
+
+        if (configName == null || resourceFilter == null) {
+            System.out.println("Creating full resource package...");
+        } else {
+            System.out.println(String.format(
+                    "Creating resource package for config '%1$s' (%2$s)...",
+                    configName, resourceFilter));
+        }
+
+        // create a task for the default apk.
+        ExecTask task = new ExecTask();
+        task.setExecutable(mExecutable);
+        task.setFailonerror(true);
+        
+        // aapt command. Only "package" is supported at this time really.
+        task.createArg().setValue(mCommand);
+        
+        // filters if needed
+        if (configName != null && resourceFilter != null) {
+            task.createArg().setValue("-c");
+            task.createArg().setValue(resourceFilter);
+        }
+        
+        // force flag
+        task.createArg().setValue("-f");
+        
+        // manifest location
+        task.createArg().setValue("-M");
+        task.createArg().setValue(mManifest);
+
+        // resources location
+        task.createArg().setValue("-S");
+        task.createArg().setValue(mResources);
+        
+        // assets location. this may not exists, and aapt doesn't like it, so we check first.
+        File assets = new File(mAssets);
+        if (assets.isDirectory()) {
+            task.createArg().setValue("-A");
+            task.createArg().setValue(mAssets);
+        }
+        
+        // android.jar
+        task.createArg().setValue("-I");
+        task.createArg().setValue(mAndroidJar);
+        
+        // out file. This is based on the outFolder, baseName, and the configName (if applicable)
+        String filename;
+        if (configName != null && resourceFilter != null) {
+            filename = mBaseName + "-" + configName + ".ap_";
+        } else {
+            filename = mBaseName + ".ap_";
+        }
+        
+        File file = new File(mOutFolder, filename);
+        task.createArg().setValue("-F");
+        task.createArg().setValue(file.getAbsolutePath());
+        
+        // final setup of the task
+        task.setProject(taskProject);
+        task.setOwningTarget(getOwningTarget());
+        
+        // execute it.
+        task.execute();
+    }
+}
diff --git a/anttasks/src/com/android/ant/ApkBuilderTask.java b/anttasks/src/com/android/ant/ApkBuilderTask.java
new file mode 100644
index 0000000..22729ec
--- /dev/null
+++ b/anttasks/src/com/android/ant/ApkBuilderTask.java
@@ -0,0 +1,293 @@
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.ant;
+
+import com.android.apkbuilder.ApkBuilder;
+import com.android.apkbuilder.ApkBuilder.ApkFile;
+import com.android.sdklib.project.ApkConfigurationHelper;
+import com.android.sdklib.project.ProjectProperties;
+import com.android.sdklib.project.ProjectProperties.PropertyType;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.ProjectComponent;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.types.Path;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.Set;
+import java.util.Map.Entry;
+
+public class ApkBuilderTask extends Task {
+    
+    /**
+     * Class to represent nested elements. Since they all have only one attribute ('path'), the
+     * same class can be used for all the nested elements (zip, file, sourcefolder, jarfolder,
+     * nativefolder).
+     */
+    public final static class Value extends ProjectComponent {
+        String mPath;
+        
+        /**
+         * Sets the value of the "path" attribute.
+         * @param path the value.
+         */
+        public void setPath(Path path) {
+            mPath = path.toString();
+        }
+    }
+
+    private String mOutFolder;
+    private String mBaseName;
+    private boolean mVerbose = false;
+    private boolean mSigned = true;
+    
+    private final ArrayList<Value> mZipList = new ArrayList<Value>();
+    private final ArrayList<Value> mFileList = new ArrayList<Value>();
+    private final ArrayList<Value> mSourceList = new ArrayList<Value>();
+    private final ArrayList<Value> mJarList = new ArrayList<Value>();
+    private final ArrayList<Value> mNativeList = new ArrayList<Value>();
+
+    private final ArrayList<FileInputStream> mZipArchives = new ArrayList<FileInputStream>();
+    private final ArrayList<File> mArchiveFiles = new ArrayList<File>();
+    private final ArrayList<ApkFile> mJavaResources = new ArrayList<ApkFile>();
+    private final ArrayList<FileInputStream> mResourcesJars = new ArrayList<FileInputStream>();
+    private final ArrayList<ApkFile> mNativeLibraries = new ArrayList<ApkFile>();
+
+    /**
+     * Sets the value of the "outfolder" attribute.
+     * @param outFolder the value.
+     */
+    public void setOutfolder(Path outFolder) {
+        mOutFolder = outFolder.toString();
+    }
+    
+    /**
+     * Sets the value of the "basename" attribute.
+     * @param baseName the value.
+     */
+    public void setBasename(String baseName) {
+        mBaseName = baseName;
+    }
+    
+    /**
+     * Sets the value of the "verbose" attribute.
+     * @param verbose the value.
+     */
+    public void setVerbose(boolean verbose) {
+        mVerbose = verbose;
+    }
+    
+    /**
+     * Sets the value of the "signed" attribute.
+     * @param signed the value.
+     */
+    public void setSigned(boolean signed) {
+        mSigned = signed;
+    }
+    
+    /**
+     * Returns an object representing a nested <var>zip</var> element.
+     */
+    public Object createZip() {
+        Value zip = new Value();
+        mZipList.add(zip);
+        return zip;
+    }
+    
+    /**
+     * Returns an object representing a nested <var>file</var> element.
+     */
+    public Object createFile() {
+        Value file = new Value();
+        mFileList.add(file);
+        return file;
+    }
+
+    /**
+     * Returns an object representing a nested <var>sourcefolder</var> element.
+     */
+    public Object createSourcefolder() {
+        Value file = new Value();
+        mSourceList.add(file);
+        return file;
+    }
+
+    /**
+     * Returns an object representing a nested <var>jarfolder</var> element.
+     */
+    public Object createJarfolder() {
+        Value file = new Value();
+        mJarList.add(file);
+        return file;
+    }
+    
+    /**
+     * Returns an object representing a nested <var>nativefolder</var> element.
+     */
+    public Object createNativefolder() {
+        Value file = new Value();
+        mNativeList.add(file);
+        return file;
+    }
+    
+    @Override
+    public void execute() throws BuildException {
+        Project taskProject = getProject();
+        
+        ApkBuilder apkBuilder = new ApkBuilder();
+        apkBuilder.setVerbose(mVerbose);
+        apkBuilder.setSignedPackage(mSigned);
+        
+        try {
+            // setup the list of everything that needs to go in the archive.
+            
+            // go through the list of zip files to add. This will not include
+            // the resource package, which is handled separaly for each apk to create.
+            for (Value v : mZipList) {
+                FileInputStream input = new FileInputStream(v.mPath);
+                mZipArchives.add(input);
+            }
+            
+            // now go through the list of file to directly add the to the list.
+            for (Value v : mFileList) {
+                mArchiveFiles.add(ApkBuilder.getInputFile(v.mPath));
+            }
+            
+            // now go through the list of file to directly add the to the list.
+            for (Value v : mSourceList) {
+                ApkBuilder.processSourceFolderForResource(v.mPath, mJavaResources);
+            }
+            
+            // now go through the list of jar folders.
+            for (Value v : mJarList) {
+                ApkBuilder.processJarFolder(v.mPath, mResourcesJars);
+            }
+            
+            // now the native lib folder.
+            for (Value v : mNativeList) {
+                String parameter = v.mPath;
+                File f = new File(parameter);
+                
+                // compute the offset to get the relative path
+                int offset = parameter.length();
+                if (parameter.endsWith(File.separator) == false) {
+                    offset++;
+                }
+
+                ApkBuilder.processNativeFolder(offset, f, mNativeLibraries);
+            }
+
+            
+            // first do a full resource package
+            createApk(apkBuilder, null /*configName*/, null /*resourceFilter*/);
+    
+            // now see if we need to create file with filtered resources.
+            // Get the project base directory.
+            File baseDir = taskProject.getBaseDir();
+            ProjectProperties properties = ProjectProperties.load(baseDir.getAbsolutePath(),
+                    PropertyType.DEFAULT);
+            
+            Map<String, String> apkConfigs = ApkConfigurationHelper.getConfigs(properties);
+            if (apkConfigs.size() > 0) {
+                Set<Entry<String, String>> entrySet = apkConfigs.entrySet();
+                for (Entry<String, String> entry : entrySet) {
+                    createApk(apkBuilder, entry.getKey(), entry.getValue());
+                }
+            }
+        } catch (FileNotFoundException e) {
+            throw new BuildException(e);
+        } catch (IllegalArgumentException e) {
+            throw new BuildException(e);
+        }
+    }
+    
+    /**
+     * Creates an application package.
+     * @param apkBuilder 
+     * @param configName the name of the filter config. Can be null in which case a full resource
+     * package will be generated.
+     * @param resourceFilter the resource configuration filter to pass to aapt (if configName is
+     * non null)
+     * @throws FileNotFoundException 
+     */
+    private void createApk(ApkBuilder apkBuilder, String configName, String resourceFilter)
+            throws FileNotFoundException {
+        // All the files to be included in the archive have already been prep'ed up, except
+        // the resource package.
+        // figure out its name.
+        String filename;
+        if (configName != null && resourceFilter != null) {
+            filename = mBaseName + "-" + configName + ".ap_";
+        } else {
+            filename = mBaseName + ".ap_";
+        }
+        
+        // now we add it to the list of zip archive (it's just a zip file).
+        
+        // it's used as a zip archive input
+        FileInputStream resoucePackageZipFile = new FileInputStream(new File(mOutFolder, filename));
+        mZipArchives.add(resoucePackageZipFile);
+        
+        // prepare the filename to generate. Same thing as the resource file.
+        if (configName != null && resourceFilter != null) {
+            filename = mBaseName + "-" + configName;
+        } else {
+            filename = mBaseName;
+        }
+        
+        if (mSigned) {
+            filename = filename + "-debug.apk";
+        } else {
+            filename = filename + "-unsigned.apk";
+        }
+
+        if (configName == null || resourceFilter == null) {
+            if (mSigned) {
+                System.out.println(String.format(
+                        "Creating %s and signing it with a debug key...", filename));
+            } else {
+                System.out.println(String.format(
+                        "Creating %s for release...", filename));
+            }
+        } else {
+            if (mSigned) {
+                System.out.println(String.format(
+                        "Creating %1$s (with %2$s) and signing it with a debug key...",
+                        filename, resourceFilter));
+            } else {
+                System.out.println(String.format(
+                        "Creating %1$s (with %2$s) for release...",
+                        filename, resourceFilter));
+            }
+        }
+        
+        File f = new File(mOutFolder, filename);
+        
+        // and generate the apk
+        apkBuilder.createPackage(f.getAbsoluteFile(), mZipArchives,
+                mArchiveFiles, mJavaResources, mResourcesJars, mNativeLibraries);
+        
+        // we are done. We need to remove the resource package from the list of zip archives
+        // in case we have another apk to generate.
+        mZipArchives.remove(resoucePackageZipFile);
+    }
+}
diff --git a/anttasks/src/com/android/ant/AndroidInitTask.java b/anttasks/src/com/android/ant/SetupTask.java
index d5bc55b..d425a2f 100644
--- a/anttasks/src/com/android/ant/AndroidInitTask.java
+++ b/anttasks/src/com/android/ant/SetupTask.java
@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2008 The Android Open Source Project
+ * Copyright (C) 2009 The Android Open Source Project
  *
- * Licensed under the Eclipse Public License, Version 1.0 (the "License");
+ * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.eclipse.org/org/documents/epl-v10.php
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -33,7 +33,7 @@ import java.util.ArrayList;
 import java.util.HashSet;
 
 /**
- * Import Target Ant task. This task accomplishes:
+ * Setup/Import Ant task. This task accomplishes:
  * <ul>
  * <li>Gets the project target hash string from {@link ProjectProperties#PROPERTY_TARGET},
  * and resolves it to get the project's {@link IAndroidTarget}.</li>
@@ -42,13 +42,13 @@ import java.util.HashSet;
  * the libraries. This includes the default android.jar from the resolved target but also optional
  * libraries provided by the target (if any, when the target is an add-on).</li>
  * <li>Imports the build rules located in the resolved target so that the build actually does
- * something.</li>
- * </ul>
+ * something. This can be disabled with the attribute <var>import</var> set to <code>false</code>
+ * </li></ul>
  * 
  * This is used in build.xml/template.
  *
  */
-public class AndroidInitTask extends ImportTask {
+public final class SetupTask extends ImportTask {
     private final static String ANDROID_RULES = "android_rules.xml";
     
     // ant property with the path to the android.jar
@@ -63,6 +63,8 @@ public class AndroidInitTask extends ImportTask {
     private final static String PROPERTY_DX = "dx";
     // ref id to the <path> object containing all the boot classpaths.
     private final static String REF_CLASSPATH = "android.target.classpath";
+    
+    private boolean mDoImport = true;
 
     @Override
     public void execute() throws BuildException {
@@ -172,24 +174,35 @@ public class AndroidInitTask extends ImportTask {
         // find the file to import, and import it.
         String templateFolder = androidTarget.getPath(IAndroidTarget.TEMPLATES);
         
-        // make sure the file exists.
-        File templates = new File(templateFolder);
-        if (templates.isDirectory() == false) {
-            throw new BuildException(String.format("Template directory '%s' is missing.",
-                    templateFolder));
+        // Now the import section. This is only executed if the task actually has to import a file.
+        if (mDoImport) {
+            // make sure the file exists.
+            File templates = new File(templateFolder);
+            if (templates.isDirectory() == false) {
+                throw new BuildException(String.format("Template directory '%s' is missing.",
+                        templateFolder));
+            }
+            
+            // now check the rules file exists.
+            File rules = new File(templateFolder, ANDROID_RULES);
+            if (rules.isFile() == false) {
+                throw new BuildException(String.format("Build rules file '%s' is missing.",
+                        templateFolder));
+           }
+            
+            // set the file location to import
+            setFile(rules.getAbsolutePath());
+            
+            // and import
+            super.execute();
         }
-        
-        // now check the rules file exists.
-        File rules = new File(templateFolder, ANDROID_RULES);
-        if (rules.isFile() == false) {
-            throw new BuildException(String.format("Build rules file '%s' is missing.",
-                    templateFolder));
-       }
-        
-        // set the file location to import
-        setFile(rules.getAbsolutePath());
-        
-        // and import it
-        super.execute();
+    }
+
+    /**
+     * Sets the value of the "import" attribute.
+     * @param value the value.
+     */
+    public void setImport(boolean value) {
+        mDoImport = value;
     }
 }
diff --git a/apkbuilder/src/com/android/apkbuilder/ApkBuilder.java b/apkbuilder/src/com/android/apkbuilder/ApkBuilder.java
index 8616cda..40abff1 100644
--- a/apkbuilder/src/com/android/apkbuilder/ApkBuilder.java
+++ b/apkbuilder/src/com/android/apkbuilder/ApkBuilder.java
@@ -51,7 +51,7 @@ public final class ApkBuilder {
      * A File to be added to the APK archive.
      * <p/>This includes the {@link File} representing the file and its path in the archive.
      */
-    private final static class ApkFile {
+    public final static class ApkFile {
         String archivePath;
         File file;
 
@@ -64,6 +64,8 @@ public final class ApkBuilder {
     private JavaResourceFilter mResourceFilter = new JavaResourceFilter();
     private boolean mVerbose = false;
     private boolean mSignedPackage = true;
+    /** the optional type of the debug keystore. If <code>null</code>, the default */
+    private String mStoreType = null;
 
     /**
      * @param args
@@ -71,110 +73,97 @@ public final class ApkBuilder {
     public static void main(String[] args) {
         new ApkBuilder().run(args);
     }
+    
+    public void setVerbose(boolean verbose) {
+        mVerbose = verbose;
+    }
+    
+    public void setSignedPackage(boolean signedPackage) {
+        mSignedPackage = signedPackage;
+    }
 
     private void run(String[] args) {
         if (args.length < 1) {
             printUsageAndQuit();
         }
-        
-        // read the first args that should be a file path
-        File outFile = getOutFile(args[0]);
-
-        ArrayList<FileInputStream> zipArchives = new ArrayList<FileInputStream>();
-        ArrayList<File> archiveFiles = new ArrayList<File>();
-        ArrayList<ApkFile> javaResources = new ArrayList<ApkFile>();
-        ArrayList<FileInputStream> resourcesJars = new ArrayList<FileInputStream>();
-        ArrayList<ApkFile> nativeLibraries = new ArrayList<ApkFile>();
-
-        // optional store type.
-        String storeType = null;
-
-        int index = 1;
-        do {
-            String argument = args[index++];
-
-            if ("-v".equals(argument)) {
-                mVerbose = true;
-            } else if ("-u".equals(argument)) {
-                mSignedPackage = false;
-            } else if ("-z".equals(argument)) {
-                // quick check on the next argument.
-                if (index == args.length) printUsageAndQuit();
-                
-                try {
-                    FileInputStream input = new FileInputStream(args[index++]);
-                    zipArchives.add(input);
-                } catch (FileNotFoundException e) {
-                    printAndExit(e.getMessage());
-                }
-            } else if ("-f". equals(argument)) {
-                // quick check on the next argument.
-                if (index == args.length) printUsageAndQuit();
-
-                archiveFiles.add(getInputFile(args[index++]));
-            } else if ("-rf". equals(argument)) {
-                // quick check on the next argument.
-                if (index == args.length) printUsageAndQuit();
-
-                processSourceFolderForResource(args[index++], javaResources);
-            } else if ("-rj". equals(argument)) {
-                // quick check on the next argument.
-                if (index == args.length) printUsageAndQuit();
 
-                String parameter = args[index++];
-                File f = new File(parameter);
-                if (f.isDirectory()) {
-                    String[] files = f.list(new FilenameFilter() {
-                        public boolean accept(File dir, String name) {
-                            return PATTERN_JAR_EXT.matcher(name).matches();
-                        }
-                    });
-
-                    for (String file : files) {
-                        try {
-                            String path = f.getAbsolutePath() + File.separator + file;
-                            FileInputStream input = new FileInputStream(path);
-                            resourcesJars.add(input);
-                        } catch (FileNotFoundException e) {
-                            printAndExit(e.getMessage());
-                        }
-                    }
-                } else {
+        try {
+            // read the first args that should be a file path
+            File outFile = getOutFile(args[0]);
+    
+            ArrayList<FileInputStream> zipArchives = new ArrayList<FileInputStream>();
+            ArrayList<File> archiveFiles = new ArrayList<File>();
+            ArrayList<ApkFile> javaResources = new ArrayList<ApkFile>();
+            ArrayList<FileInputStream> resourcesJars = new ArrayList<FileInputStream>();
+            ArrayList<ApkFile> nativeLibraries = new ArrayList<ApkFile>();
+    
+            int index = 1;
+            do {
+                String argument = args[index++];
+    
+                if ("-v".equals(argument)) {
+                    mVerbose = true;
+                } else if ("-u".equals(argument)) {
+                    mSignedPackage = false;
+                } else if ("-z".equals(argument)) {
+                    // quick check on the next argument.
+                    if (index == args.length) printUsageAndQuit();
+                    
                     try {
-                        FileInputStream input = new FileInputStream(parameter);
-                        resourcesJars.add(input);
+                        FileInputStream input = new FileInputStream(args[index++]);
+                        zipArchives.add(input);
                     } catch (FileNotFoundException e) {
                         printAndExit(e.getMessage());
                     }
+                } else if ("-f". equals(argument)) {
+                    // quick check on the next argument.
+                    if (index == args.length) printUsageAndQuit();
+    
+                    archiveFiles.add(getInputFile(args[index++]));
+                } else if ("-rf". equals(argument)) {
+                    // quick check on the next argument.
+                    if (index == args.length) printUsageAndQuit();
+    
+                    processSourceFolderForResource(args[index++], javaResources);
+                } else if ("-rj". equals(argument)) {
+                    // quick check on the next argument.
+                    if (index == args.length) printUsageAndQuit();
+                    
+                    processJarFolder(args[index++], resourcesJars);
+                } else if ("-nf".equals(argument)) {
+                    // quick check on the next argument.
+                    if (index == args.length) printUsageAndQuit();
+                    
+                    String parameter = args[index++];
+                    File f = new File(parameter);
+    
+                    // compute the offset to get the relative path
+                    int offset = parameter.length();
+                    if (parameter.endsWith(File.separator) == false) {
+                        offset++;
+                    }
+    
+                    processNativeFolder(offset, f, nativeLibraries);
+                } else if ("-storetype".equals(argument)) {
+                    // quick check on the next argument.
+                    if (index == args.length) printUsageAndQuit();
+                    
+                    mStoreType  = args[index++];
+                } else {
+                    printAndExit("Unknown argument: " + argument);
                 }
-            } else if ("-nf".equals(argument)) {
-                // quick check on the next argument.
-                if (index == args.length) printUsageAndQuit();
-                
-                String parameter = args[index++];
-                File f = new File(parameter);
-
-                // compute the offset to get the relative path
-                int offset = parameter.length();
-                if (parameter.endsWith(File.separator) == false) {
-                    offset++;
-                }
-
-                processNativeFolder(offset, f, nativeLibraries);
-            } else if ("-storetype".equals(argument)) {
-                // quick check on the next argument.
-                if (index == args.length) printUsageAndQuit();
-                
-                storeType  = args[index++];
-            } else {
-                printAndExit("Unknown argument: " + argument);
-            }
-        } while (index < args.length);
-        
-        createPackage(outFile, zipArchives, archiveFiles, javaResources, resourcesJars,
-                nativeLibraries, storeType);
+            } while (index < args.length);
+            
+            createPackage(outFile, zipArchives, archiveFiles, javaResources, resourcesJars,
+                    nativeLibraries);
+        } catch (IllegalArgumentException e) {
+            printAndExit(e.getMessage());
+        } catch (FileNotFoundException e) {
+            printAndExit(e.getMessage());
+        }
     }
 
+
     private File getOutFile(String filepath) {
         File f = new File(filepath);
         
@@ -199,31 +188,30 @@ public final class ApkBuilder {
         return f;
     }
 
-    private File getInputFile(String filepath) {
+    public static File getInputFile(String filepath) throws IllegalArgumentException {
         File f = new File(filepath);
         
         if (f.isDirectory()) {
-            printAndExit(filepath + " is a directory!");
+            throw new IllegalArgumentException(filepath + " is a directory!");
         }
         
         if (f.exists()) {
             if (f.canRead() == false) {
-                printAndExit("Cannot read " + filepath);
+                throw new IllegalArgumentException("Cannot read " + filepath);
             }
         } else {
-            printAndExit(filepath + " does not exists!");
+            throw new IllegalArgumentException(filepath + " does not exists!");
         }
 
         return f;
     }
 
     /**
-     * Processes a source folder and add its java resources to the list of {@link ApkFile} to
-     * write into the {@link SignedJarBuilder}.
+     * Processes a source folder and adds its java resources to a given list of {@link ApkFile}.
      * @param folderPath the path to the source folder.
      * @param javaResources the list of {@link ApkFile} to fill.
      */
-    private void processSourceFolderForResource(String folderPath,
+    public static void processSourceFolderForResource(String folderPath,
             ArrayList<ApkFile> javaResources) {
         
         File folder = new File(folderPath);
@@ -237,12 +225,34 @@ public final class ApkBuilder {
         } else {
             // not a directory? output error and quit.
             if (folder.exists()) {
-                printAndExit(folderPath + " is not a folder!");
+                throw new IllegalArgumentException(folderPath + " is not a folder!");
             } else {
-                printAndExit(folderPath + " does not exist!");
+                throw new IllegalArgumentException(folderPath + " does not exist!");
+            }
+        }
+    }
+    
+    public static void processJarFolder(String parameter, ArrayList<FileInputStream> resourcesJars)
+            throws FileNotFoundException {
+        File f = new File(parameter);
+        if (f.isDirectory()) {
+            String[] files = f.list(new FilenameFilter() {
+                public boolean accept(File dir, String name) {
+                    return PATTERN_JAR_EXT.matcher(name).matches();
+                }
+            });
+
+            for (String file : files) {
+                String path = f.getAbsolutePath() + File.separator + file;
+                FileInputStream input = new FileInputStream(path);
+                resourcesJars.add(input);
             }
+        } else {
+            FileInputStream input = new FileInputStream(parameter);
+            resourcesJars.add(input);
         }
     }
+
     
     /**
      * Processes a {@link File} that could be a {@link ApkFile}, or a folder containing
@@ -252,7 +262,7 @@ public final class ApkBuilder {
      * identify a root file. 
      * @param javaResources the list of {@link ApkFile} object to fill.
      */
-    private void processFileForResource(File file, String path,
+    private static void processFileForResource(File file, String path,
             ArrayList<ApkFile> javaResources) {
         if (file.isDirectory()) {
             // a directory? we check it
@@ -292,7 +302,7 @@ public final class ApkBuilder {
      * @param f the {@link File} to process
      * @param nativeLibraries the array to add native libraries.
      */
-    private void processNativeFolder(int offset, File f, ArrayList<ApkFile> nativeLibraries) {
+    public static void processNativeFolder(int offset, File f, ArrayList<ApkFile> nativeLibraries) {
         if (f.isDirectory()) {
             File[] children = f.listFiles();
             
@@ -318,13 +328,11 @@ public final class ApkBuilder {
      * @param resourcesJars 
      * @param files 
      * @param javaResources 
-     * @param storeType the optional type of the debug keystore. If <code>null</code>, the default
      * keystore type of the Java VM is used.
      */
-    private void createPackage(File outFile, ArrayList<FileInputStream> zipArchives,
+    public void createPackage(File outFile, ArrayList<FileInputStream> zipArchives,
             ArrayList<File> files, ArrayList<ApkFile> javaResources,
-            ArrayList<FileInputStream> resourcesJars, ArrayList<ApkFile> nativeLibraries,
-            String storeType) {
+            ArrayList<FileInputStream> resourcesJars, ArrayList<ApkFile> nativeLibraries) {
         
         // get the debug key
         try {
@@ -337,18 +345,18 @@ public final class ApkBuilder {
                 
                 DebugKeyProvider keyProvider = new DebugKeyProvider(
                         null /* osKeyPath: use default */,
-                        storeType, null /* IKeyGenOutput */);
+                        mStoreType, null /* IKeyGenOutput */);
                 PrivateKey key = keyProvider.getDebugKey();
                 X509Certificate certificate = (X509Certificate)keyProvider.getCertificate();
                 
                 if (key == null) {
-                    printAndExit("Unable to get debug signature key");
+                    throw new IllegalArgumentException("Unable to get debug signature key");
                 }
                 
                 // compare the certificate expiration date
                 if (certificate != null && certificate.getNotAfter().compareTo(new Date()) < 0) {
                     // TODO, regenerate a new one.
-                    printAndExit("Debug Certificate expired on " +
+                    throw new IllegalArgumentException("Debug Certificate expired on " +
                             DateFormat.getInstance().format(certificate.getNotAfter()));
                 }
 
@@ -403,21 +411,20 @@ public final class ApkBuilder {
             builder.close();
         } catch (KeytoolException e) {
             if (e.getJavaHome() == null) {
-                printAndExit(e.getMessage(),
-                        "JAVA_HOME seems undefined, setting it will help locating keytool automatically",
-                        "You can also manually execute the following command:",
+                throw new IllegalArgumentException(e.getMessage() + 
+                        "\nJAVA_HOME seems undefined, setting it will help locating keytool automatically\n" +
+                        "You can also manually execute the following command\n:" +
                         e.getCommandLine());
             } else {
-                printAndExit(e.getMessage(),
-                        "JAVA_HOME is set to: " + e.getJavaHome(),
-                        "Update it if necessary, or manually execute the following command:",
+                throw new IllegalArgumentException(e.getMessage() + 
+                        "\nJAVA_HOME is set to: " + e.getJavaHome() +
+                        "\nUpdate it if necessary, or manually execute the following command:\n" +
                         e.getCommandLine());
             }
-            System.err.println(e.getMessage());
         } catch (AndroidLocationException e) {
-            printAndExit(e.getMessage());
+            throw new IllegalArgumentException(e);
         } catch (Exception e) {
-            printAndExit(e.getMessage());
+            throw new IllegalArgumentException(e);
         }
     }
 
diff --git a/eclipse/buildConfig/allElements.xml b/eclipse/buildConfig/allElements.xml
index 99ab3aa..2c8229c 100644
--- a/eclipse/buildConfig/allElements.xml
+++ b/eclipse/buildConfig/allElements.xml
@@ -16,6 +16,11 @@
          
          <ant antfile="${genericTargets}" target="${target}">
              <property name="type" value="feature" />
+             <property name="id" value="com.android.ide.eclipse.ddms" />
+         </ant>
+
+         <ant antfile="${genericTargets}" target="${target}">
+             <property name="type" value="feature" />
              <property name="id" value="com.android.ide.eclipse.adt" />
          </ant>
          
@@ -44,6 +49,10 @@
      <target name="assemble.com.android.ide.eclipse.adt">
          <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
      </target>
+
+     <target name="assemble.com.android.ide.eclipse.ddms">
+         <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
+     </target>
     
     <target name="assemble.com.android.ide.eclipse.tests">
         <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
diff --git a/eclipse/features/com.android.ide.eclipse.adt/feature.xml b/eclipse/features/com.android.ide.eclipse.adt/feature.xml
index 676a89e..b9e2c7f 100644
--- a/eclipse/features/com.android.ide.eclipse.adt/feature.xml
+++ b/eclipse/features/com.android.ide.eclipse.adt/feature.xml
@@ -7,15 +7,101 @@
       plugin="com.android.ide.eclipse.adt">
 
    <description>
-      This feature provides support for Android Projects in Eclipse.
+      Android Developer Tools.
    </description>
 
    <copyright>
       Copyright (C) 2007 The Android Open Source Project
    </copyright>
 
-   <license>
-      License TBD.
+   <license url="http://www.eclipse.org/org/documents/epl-v10.php">
+      Eclipse Public License - v 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT&apos;S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+&quot;Contribution&quot; means:
+
+a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
+
+b) in the case of each subsequent Contributor:
+
+i) changes to the Program, and
+
+ii) additions to the Program;
+
+where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution &apos;originates&apos; from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor&apos;s behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
+
+&quot;Contributor&quot; means any person or entity that distributes the Program.
+
+&quot;Licensed Patents&quot; mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
+
+&quot;Program&quot; means the Contributions distributed in accordance with this Agreement.
+
+&quot;Recipient&quot; means anyone who receives the Program under this Agreement, including all Contributors.
+
+2. GRANT OF RIGHTS
+
+a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
+
+b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
+
+c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient&apos;s responsibility to acquire that license before distributing the Program.
+
+d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
+
+a) it complies with the terms and conditions of this Agreement; and
+
+b) its license agreement:
+
+i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
+
+ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
+
+iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
+
+iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
+
+When the Program is made available in source code form:
+
+a) it must be made available under this Agreement; and
+
+b) a copy of this Agreement must be included with each copy of the Program.
+
+Contributors may not remove or alter any copyright notices contained within the Program.
+
+Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor (&quot;Commercial Contributor&quot;) hereby agrees to defend and indemnify every other Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor&apos;s responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient&apos;s patent(s), then such Recipient&apos;s rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient&apos;s rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient&apos;s rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient&apos;s obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
    </license>
 
    <url>
@@ -23,6 +109,7 @@
    </url>
 
    <requires>
+      <import plugin="com.android.ide.eclipse.ddms"/>
       <import plugin="org.eclipse.core.runtime"/>
       <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.debug.core"/>
@@ -56,11 +143,4 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="com.android.ide.eclipse.ddms"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
 </feature>
diff --git a/eclipse/features/com.android.ide.eclipse.ddms/.project b/eclipse/features/com.android.ide.eclipse.ddms/.project
new file mode 100644
index 0000000..f80ff60
--- /dev/null
+++ b/eclipse/features/com.android.ide.eclipse.ddms/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>ddms-feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/eclipse/features/com.android.ide.eclipse.ddms/build.properties b/eclipse/features/com.android.ide.eclipse.ddms/build.properties
new file mode 100644
index 0000000..64f93a9
--- /dev/null
+++ b/eclipse/features/com.android.ide.eclipse.ddms/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml
diff --git a/eclipse/features/com.android.ide.eclipse.ddms/feature.xml b/eclipse/features/com.android.ide.eclipse.ddms/feature.xml
new file mode 100644
index 0000000..dfdf985
--- /dev/null
+++ b/eclipse/features/com.android.ide.eclipse.ddms/feature.xml
@@ -0,0 +1,237 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="com.android.ide.eclipse.ddms"
+      label="Android DDMS"
+      version="0.9.0.qualifier"
+      provider-name="The Android Open Source Project">
+
+   <description>
+      Android Dalvik Debug Monitor Service
+   </description>
+
+   <copyright>
+      Copyright (C) 2007 The Android Open Source Project
+   </copyright>
+
+   <license url="http://www.apache.org/licenses/LICENSE-2.0">
+      Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      &quot;License&quot; shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      &quot;Licensor&quot; shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      &quot;Legal Entity&quot; shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      &quot;control&quot; means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      &quot;You&quot; (or &quot;Your&quot;) shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      &quot;Source&quot; form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      &quot;Object&quot; form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      &quot;Work&quot; shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      &quot;Derivative Works&quot; shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      &quot;Contribution&quot; shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, &quot;submitted&quot;
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as &quot;Not a Contribution.&quot;
+
+      &quot;Contributor&quot; shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a &quot;NOTICE&quot; text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an &quot;AS IS&quot; BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets &quot;[]&quot;
+      replaced with your own identifying information. (Don&apos;t include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same &quot;printed page&quot; as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an &quot;AS IS&quot; BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   </license>
+
+   <url>
+      <update label="Android Update Site" url="https://dl-ssl.google.com/android/eclipse/"/>
+   </url>
+
+   <requires>
+      <import plugin="org.eclipse.ui"/>
+      <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.eclipse.ui.console"/>
+   </requires>
+
+   <plugin
+         id="com.android.ide.eclipse.ddms"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/plugin.xml b/eclipse/plugins/com.android.ide.eclipse.adt/plugin.xml
index ade4646..f7c366d 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/plugin.xml
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/plugin.xml
@@ -290,7 +290,7 @@
       <perspectiveExtension targetID="org.eclipse.jdt.ui.JavaPerspective">
          <newWizardShortcut id="com.android.ide.eclipse.adt.project.NewProjectWizard" />
          <newWizardShortcut
-               id="com.android.ide.eclipse.adt.wizards.NewXmlFileWizard">
+               id="com.android.ide.eclipse.editors.wizards.NewXmlFileWizard">
          </newWizardShortcut>
       </perspectiveExtension>
       <perspectiveExtension targetID="org.eclipse.debug.ui.DebugPerspective">
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/build/ApkBuilder.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/build/ApkBuilder.java
index c359905..96068c2 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/build/ApkBuilder.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/build/ApkBuilder.java
@@ -284,7 +284,7 @@ public class ApkBuilder extends BaseBuilder {
 
         // get the extra configs for the project. This will give us a list of custom apk
         // to build based on a restricted set of resources.
-        Map<String, String> configs = Sdk.getCurrent().getProjectConfigs(project);
+        Map<String, String> configs = Sdk.getCurrent().getProjectApkConfigs(project);
 
         // also check the final file(s)!
         String finalPackageName = getFileName(project, null /*config*/);
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/sdk/Sdk.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/sdk/Sdk.java
index 5bfa8a2..c7773cc 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/sdk/Sdk.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/sdk/Sdk.java
@@ -26,6 +26,7 @@ import com.android.sdklib.ISdkLog;
 import com.android.sdklib.SdkConstants;
 import com.android.sdklib.SdkManager;
 import com.android.sdklib.avd.AvdManager;
+import com.android.sdklib.project.ApkConfigurationHelper;
 import com.android.sdklib.project.ProjectProperties;
 import com.android.sdklib.project.ProjectProperties.PropertyType;
 
@@ -43,8 +44,6 @@ import java.net.URL;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Set;
-import java.util.Map.Entry;
 
 /**
  * Central point to load, manipulate and deal with the Android SDK. Only one SDK can be used
@@ -65,7 +64,7 @@ public class Sdk implements IProjectListener {
             new HashMap<IProject, IAndroidTarget>();
     private final HashMap<IAndroidTarget, AndroidTargetData> mTargetDataMap = 
             new HashMap<IAndroidTarget, AndroidTargetData>();
-    private final HashMap<IProject, Map<String, String>> mProjectConfigMap =
+    private final HashMap<IProject, Map<String, String>> mProjectApkConfigMap =
         new HashMap<IProject, Map<String, String>>();
     private final String mDocBaseUrl;
     
@@ -214,10 +213,10 @@ public class Sdk implements IProjectListener {
      * the root folder of the project.
      * <p/>The returned string is equivalent to the return of {@link IAndroidTarget#hashString()}.
      * @param project The project for which to return the target hash string.
-     * @param storeConfigs Whether the read configuration should be stored in the map. 
+     * @param sdkStorage The sdk in which to store the Apk Configs. Can be null. 
      * @return the hash string or null if the project does not have a target set.
      */
-    private static String loadProjectProperties(IProject project, Sdk storeConfigs) {
+    private static String loadProjectProperties(IProject project, Sdk sdkStorage) {
         // load the default.properties from the project folder.
         ProjectProperties properties = ProjectProperties.load(project.getLocation().toOSString(),
                 PropertyType.DEFAULT);
@@ -227,25 +226,11 @@ public class Sdk implements IProjectListener {
             return null;
         }
         
-        if (storeConfigs != null) {
-            // get the list of configs.
-            String configList = properties.getProperty(ProjectProperties.PROPERTY_CONFIGS);
-            
-            // this is a comma separated list
-            String[] configs = configList.split(","); //$NON-NLS-1$
-            
-            // read the value of each config and store it in a map
-            HashMap<String, String> configMap = new HashMap<String, String>();
-            
-            for (String config : configs) {
-                String configValue = properties.getProperty(config);
-                if (configValue != null) {
-                    configMap.put(config, configValue);
-                }
-            }
+        if (sdkStorage != null) {
+            Map<String, String> configMap = ApkConfigurationHelper.getConfigs(properties);
             
             if (configMap.size() > 0) {
-                storeConfigs.mProjectConfigMap.put(project, configMap);
+                sdkStorage.mProjectApkConfigMap.put(project, configMap);
             }
         }
         
@@ -307,14 +292,14 @@ public class Sdk implements IProjectListener {
      * <p/>The Map key are name to be used in the apk filename, while the values are comma separated
      * config values. The config value can be passed directly to aapt through the -c option.
      */
-    public Map<String, String> getProjectConfigs(IProject project) {
-        return mProjectConfigMap.get(project);
+    public Map<String, String> getProjectApkConfigs(IProject project) {
+        return mProjectApkConfigMap.get(project);
     }
     
-    public void setProjectConfigs(IProject project, Map<String, String> configMap)
+    public void setProjectApkConfigs(IProject project, Map<String, String> configMap)
             throws CoreException {
         // first set the new map
-        mProjectConfigMap.put(project, configMap);
+        mProjectApkConfigMap.put(project, configMap);
         
         // Now we write this in default.properties.
         // Because we don't want to erase other properties from default.properties, we first load
@@ -327,35 +312,8 @@ public class Sdk implements IProjectListener {
                     PropertyType.DEFAULT);
         }
         
-        // load the current configs, in order to remove the value properties for each of them
-        // in case a config was removed.
-        
-        // get the list of configs.
-        String configList = properties.getProperty(ProjectProperties.PROPERTY_CONFIGS);
-        
-        // this is a comma separated list
-        String[] configs = configList.split(","); //$NON-NLS-1$
-        
-        boolean hasRemovedConfig = false;
-        
-        for (String config : configs) {
-            if (configMap.containsKey(config) == false) {
-                hasRemovedConfig = true;
-                properties.removeProperty(config);
-            }
-        }
-        
-        // now add the properties.
-        Set<Entry<String, String>> entrySet = configMap.entrySet();
-        StringBuilder sb = new StringBuilder();
-        for (Entry<String, String> entry : entrySet) {
-            if (sb.length() > 0) {
-                sb.append(",");
-            }
-            sb.append(entry.getKey());
-            properties.setProperty(entry.getKey(), entry.getValue());
-        }
-        properties.setProperty(ProjectProperties.PROPERTY_CONFIGS, sb.toString());
+        // sets the configs in the property file.
+        boolean hasRemovedConfig = ApkConfigurationHelper.setConfigs(properties, configMap);
 
         // and rewrite the file.
         try {
@@ -445,7 +403,7 @@ public class Sdk implements IProjectListener {
 
     public void projectClosed(IProject project) {
         mProjectTargetMap.remove(project);
-        mProjectConfigMap.remove(project);
+        mProjectApkConfigMap.remove(project);
     }
 
     public void projectDeleted(IProject project) {
diff --git a/eclipse/sites/external/site.xml b/eclipse/sites/external/site.xml
index e98a988..9fca8d2 100644
--- a/eclipse/sites/external/site.xml
+++ b/eclipse/sites/external/site.xml
@@ -6,6 +6,9 @@
    <feature url="features/com.android.ide.eclipse.adt_0.9.0.qualifier.jar" id="com.android.ide.eclipse.adt" version="0.9.0.qualifier">
       <category name="developer"/>
    </feature>
+   <feature url="features/com.android.ide.eclipse.ddms_0.9.0.qualifier.jar" id="com.android.ide.eclipse.ddms" version="0.9.0.qualifier">
+      <category name="developer"/>
+   </feature>
    <category-def name="developer" label="Developer Tools">
       <description>
          Features that add Android support to Eclipse for application developers.
diff --git a/eclipse/sites/internal/site.xml b/eclipse/sites/internal/site.xml
index a7ef628..9f2642f 100644
--- a/eclipse/sites/internal/site.xml
+++ b/eclipse/sites/internal/site.xml
@@ -6,6 +6,9 @@
    <feature url="features/com.android.ide.eclipse.adt_0.9.0.qualifier.jar" id="com.android.ide.eclipse.adt" version="0.9.0.qualifier">
       <category name="developer"/>
    </feature>
+   <feature url="features/com.android.ide.eclipse.ddms_0.9.0.qualifier.jar" id="com.android.ide.eclipse.ddms" version="0.9.0.qualifier">
+      <category name="developer"/>
+   </feature>
    <feature url="features/com.android.ide.eclipse.tests_0.9.0.qualifier.jar" id="com.android.ide.eclipse.tests" version="0.9.0.qualifier">
       <category name="test"/>
    </feature>
diff --git a/scripts/android_rules.xml b/scripts/android_rules.xml
index 4698671..799aa0b 100644
--- a/scripts/android_rules.xml
+++ b/scripts/android_rules.xml
@@ -13,6 +13,17 @@
         This is used by the compiler task as the boot classpath.
     -->
 
+    <!-- Custom tasks -->
+    <taskdef name="aaptexec"
+        classname="com.android.ant.AaptExecLoopTask"
+        classpathref="android.antlibs"/>
+
+    <taskdef name="apkbuilder"
+        classname="com.android.ant.ApkBuilderTask"
+        classpathref="android.antlibs"/>
+
+    <!-- Properties -->
+
     <property name="android-tools" value="${sdk-location}/tools" />
 
     <!-- Input directories -->
@@ -20,15 +31,12 @@
     <property name="resource-folder" value="res" />
     <property name="asset-folder" value="assets" />
     <property name="source-location" value="${basedir}/${source-folder}" />
-    <available file="${basedir}/${asset-folder}" property="has.asset.folder"/>
 
     <!-- folder for the 3rd party java libraries -->
-    <property name="external-libs" value="libs" />
-    <property name="external-libs-location" value="${basedir}/${external-libs}"/>
+    <property name="external-libs-folder" value="libs" />
 
     <!-- folder for the native libraries -->
-    <property name="native-libs" value="libs" />
-    <property name="native-libs-location" value="${basedir}/${native-libs}"/>
+    <property name="native-libs-folder" value="libs" />
 
     <!-- Output directories -->
     <property name="out-folder" value="bin" />
@@ -54,21 +62,11 @@
     </condition>
 
     <!-- The final package file to generate -->
-    <property name="resources-package" value="${out-folder}/${ant.project.name}.ap_"/>
-    <property name="resources-package-location" value="${basedir}/${resources-package}"/>
-
     <property name="out-debug-package" value="${out-folder}/${ant.project.name}-debug.apk"/>
-    <property name="out-debug-package-location" value="${basedir}/${out-debug-package}"/>
-
-    <property name="out-unsigned-package" value="${out-folder}/${ant.project.name}-unsigned.apk"/>
-    <property name="out-unsigned-package-location" value="${basedir}/${out-unsigned-package}"/>
 
     <!-- Tools -->
     <condition property="exe" value="exe" else=""><os family="windows"/></condition>
-    <condition property="bat" value="bat" else=""><os family="windows"/></condition>
-
     <property name="adb" value="${android-tools}/adb${exe}"/>
-    <property name="apk-builder" value="${android-tools}/apkbuilder${bat}"/>
 
     <!-- rules -->
 
@@ -115,7 +113,7 @@
                 destdir="${out-classes}"
                 bootclasspathref="android.target.classpath">
             <classpath>
-                <fileset dir="${external-libs}" includes="*.jar"/>
+                <fileset dir="${external-libs-folder}" includes="*.jar"/>
                 <pathelement path="${main-out-classes}"/>
             </classpath>
          </javac>
@@ -128,85 +126,56 @@
             <arg value="--dex" />
             <arg value="--output=${intermediate-dex-location}" />
             <arg path="${out-classes-location}" />
-            <fileset dir="${external-libs}" includes="*.jar"/>
+            <fileset dir="${external-libs-folder}" includes="*.jar"/>
         </apply>
     </target>
 
-    <!-- Put the project's resources into the output package file. -->
-    <target name="package-res-and-assets" if="has.asset.folder">
-        <echo>Packaging resources and assets...</echo>
-        <exec executable="${aapt}" failonerror="true">
-            <arg value="package" />
-            <arg value="-f" />
-            <arg value="-M" />
-            <arg path="AndroidManifest.xml" />
-            <arg value="-S" />
-            <arg path="${resource-folder}" />
-            <arg value="-A" />
-            <arg path="${asset-folder}" />
-            <arg value="-I" />
-            <arg path="${android-jar}" />
-            <arg value="-F" />
-            <arg value="${resources-package}" />
-        </exec>
-    </target>
-
-    <!-- Same as package-res-and-assets, but without "-A ${asset-folder}" -->
-    <target name="package-res-no-assets" unless="has.asset.folder">
-        <echo>Packaging resources...</echo>
-        <exec executable="${aapt}" failonerror="true">
-            <arg value="package" />
-            <arg value="-f" />
-            <arg value="-M" />
-            <arg path="AndroidManifest.xml" />
-            <arg value="-S" />
-            <arg path="${resource-folder}" />
-            <!-- No assets directory -->
-            <arg value="-I" />
-            <arg path="${android-jar}" />
-            <arg value="-F" />
-            <arg path="${resources-package}" />
-        </exec>
+    <!-- Put the project's resources into the output package file
+         This actually can create multiple resource package in case
+         Some custom apk with specific configuration have been
+         declared in default.properties.
+         -->
+    <target name="package-resources">
+        <echo>Packaging resources</echo>
+        <aaptexec executable="${aapt}"
+                command="package"
+                manifest="AndroidManifest.xml"
+                resources="${resource-folder}"
+                assets="${asset-folder}"
+                androidjar="${android-jar}"
+                outfolder="${out-folder}"
+                basename="${ant.project.name}" />
     </target>
 
     <!-- Package the application and sign it with a debug key.
          This is the default target when building. It is used for debug. -->
-    <target name="debug" depends="dex, package-res-and-assets, package-res-no-assets">
-        <echo>Packaging ${out-debug-package}, and signing it with a debug key...</echo>
-        <exec executable="${apk-builder}" failonerror="true">
-            <arg value="${out-debug-package-location}" />
-            <arg value="-z" />
-            <arg path="${resources-package-location}" />
-            <arg value="-f" />
-            <arg path="${intermediate-dex-location}" />
-            <arg value="-rf" />
-            <arg path="${source-location}" />
-            <arg value="-rj" />
-            <arg path="${external-libs-location}" />
-            <arg value="-nf" />
-            <arg path="${native-libs-location}" />
-        </exec>
+    <target name="debug" depends="dex, package-resources">
+        <apkbuilder
+                outfolder="${out-folder}"
+                basename="${ant.project.name}"
+                signed="true"
+                verbose="false">
+            <file path="${intermediate-dex}" />
+            <sourcefolder path="${source-folder}" />
+            <jarfolder path="${external-libs-folder}" />
+            <nativefolder path="${native-libs-folder}" />
+        </apkbuilder>
     </target>
 
     <!-- Package the application without signing it.
          This allows for the application to be signed later with an official publishing key. -->
-    <target name="release" depends="dex, package-res-and-assets, package-res-no-assets">
-        <echo>Packaging ${out-unsigned-package} for release...</echo>
-        <exec executable="${apk-builder}" failonerror="true">
-            <arg value="${out-unsigned-package-location}" />
-            <arg value="-u" />
-            <arg value="-z" />
-            <arg path="${resources-package-location}" />
-            <arg value="-f" />
-            <arg path="${intermediate-dex-location}" />
-            <arg value="-rf" />
-            <arg path="${source-location}" />
-            <arg value="-rj" />
-            <arg path="${external-libs-location}" />
-            <arg value="-nf" />
-            <arg path="${native-libs-location}" />
-        </exec>
-        <echo>It will need to be signed with jarsigner before it is published.</echo>
+    <target name="release" depends="dex, package-resources">
+        <apkbuilder
+                outfolder="${out-folder}"
+                basename="${ant.project.name}"
+                signed="false"
+                verbose="false">
+            <file path="${intermediate-dex}" />
+            <sourcefolder path="${source-folder}" />
+            <jarfolder path="${external-libs-folder}" />
+            <nativefolder path="${native-libs-folder}" />
+        </apkbuilder>
+        <echo>All generated packages need to be signed with jarsigner before they are published.</echo>
     </target>
 
     <!-- Install the package on the default emulator -->
diff --git a/scripts/build.template b/scripts/build.template
index 1f7f908..7939e6c 100644
--- a/scripts/build.template
+++ b/scripts/build.template
@@ -10,7 +10,7 @@
          by the 'android' tool. This is the place to change some of the default property values
          used by the Ant rules.
          Here are some properties you may want to change/update:
-         
+
          application-package
              the name of your application package as defined in the manifest. Used by the
              'uninstall' rule.
@@ -40,12 +40,22 @@
         <pathelement path="${sdk-location}/tools/lib/anttasks.jar" />
         <pathelement path="${sdk-location}/tools/lib/sdklib.jar" />
         <pathelement path="${sdk-location}/tools/lib/androidprefs.jar" />
+        <pathelement path="${sdk-location}/tools/lib/apkbuilder.jar" />
+        <pathelement path="${sdk-location}/tools/lib/jarutils.jar" />
     </path>
-    
-    <taskdef name="androidinit" classname="com.android.ant.AndroidInitTask"
+
+    <taskdef name="setup"
+        classname="com.android.ant.SetupTask"
         classpathref="android.antlibs"/>
 
-    <!-- Execute the Android Init task that will import the proper rule file containing
-         all the Ant targets, as well as setup some properties specific to the target. -->
-    <androidinit />
+    <!-- Execute the Android Setup task that will setup some properties specific to the target,
+         and import the rules files.
+         To customize the rules, copy/paste them below the task, and disable import by setting
+         the import attribute to false:
+            <setup import="false" />
+         
+         This will ensure that the properties are setup correctly but that your customized
+         targets are used.
+    -->
+    <setup />
 </project>
diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/project/ApkConfigurationHelper.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/project/ApkConfigurationHelper.java
new file mode 100644
index 0000000..ab43f46
--- /dev/null
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/project/ApkConfigurationHelper.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.sdklib.project;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.Map.Entry;
+
+/**
+ * Helper class to read and write Apk Configuration into a {@link ProjectProperties} file.
+ */
+public class ApkConfigurationHelper {
+
+    /**
+     * Reads the Apk Configurations from a {@link ProjectProperties} file and returns them as a map.
+     * <p/>If there are no defined configurations, the returned map will be empty.
+     */
+    public static Map<String, String> getConfigs(ProjectProperties properties) {
+        HashMap<String, String> configMap = new HashMap<String, String>();
+
+        // get the list of configs.
+        String configList = properties.getProperty(ProjectProperties.PROPERTY_CONFIGS);
+        if (configList != null) {
+            // this is a comma separated list
+            String[] configs = configList.split(","); //$NON-NLS-1$
+            
+            // read the value of each config and store it in a map
+            
+            for (String config : configs) {
+                String configValue = properties.getProperty(config);
+                if (configValue != null) {
+                    configMap.put(config, configValue);
+                }
+            }
+        }
+        
+        return configMap;
+    }
+    
+    /**
+     * Writes the Apk Configurations from a given map into a {@link ProjectProperties}.
+     * @return true if the {@link ProjectProperties} contained Apk Configuration that were not
+     * present in the map. 
+     */
+    public static boolean setConfigs(ProjectProperties properties, Map<String, String> configMap) {
+        // load the current configs, in order to remove the value properties for each of them
+        // in case a config was removed.
+        
+        // get the list of configs.
+        String configList = properties.getProperty(ProjectProperties.PROPERTY_CONFIGS);
+        
+        // this is a comma separated list
+        String[] configs = configList.split(","); //$NON-NLS-1$
+        
+        boolean hasRemovedConfig = false;
+        
+        for (String config : configs) {
+            if (configMap.containsKey(config) == false) {
+                hasRemovedConfig = true;
+                properties.removeProperty(config);
+            }
+        }
+        
+        // now add the properties.
+        Set<Entry<String, String>> entrySet = configMap.entrySet();
+        StringBuilder sb = new StringBuilder();
+        for (Entry<String, String> entry : entrySet) {
+            if (sb.length() > 0) {
+                sb.append(",");
+            }
+            sb.append(entry.getKey());
+            properties.setProperty(entry.getKey(), entry.getValue());
+        }
+        properties.setProperty(ProjectProperties.PROPERTY_CONFIGS, sb.toString());
+        
+        return hasRemovedConfig;
+    }
+}
diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/project/ProjectCreator.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/project/ProjectCreator.java
index 1cff43c..18e2ac9 100644
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/project/ProjectCreator.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/project/ProjectCreator.java
@@ -314,9 +314,14 @@ public class ProjectCreator {
             }
         }
 
-        // Update default.prop iif --target was specified
+        // Update default.prop if --target was specified
         if (target != null) {
-            props = ProjectProperties.create(folderPath, PropertyType.DEFAULT);
+            // we already attempted to load the file earlier, if that failed, create it.
+            if (props == null) {
+                props = ProjectProperties.create(folderPath, PropertyType.DEFAULT);
+            }
+            
+            // set or replace the target
             props.setAndroidTarget(target);
             try {
                 props.save();
@@ -330,7 +335,14 @@ public class ProjectCreator {
         }
         
         // Refresh/create "sdk" in local.properties
-        props = ProjectProperties.create(folderPath, PropertyType.LOCAL);
+        // because the file may already exists and contain other values (like apk config),
+        // we first try to load it.
+        props = ProjectProperties.load(folderPath, PropertyType.LOCAL);
+        if (props == null) {
+            props = ProjectProperties.create(folderPath, PropertyType.LOCAL);
+        }
+        
+        // set or replace the sdk location.
         props.setProperty(ProjectProperties.PROPERTY_SDK, mSdkFolder);
         try {
             props.save();