Fix aapt to be able to add configs from overlays.

[android/aapt.git] / Command.cpp

diff --git a/Command.cpp b/Command.cpp
index c02e2c04c63f2592bb17faa5cb62702c51c06173..c0ae592f669269ded8566981800a908fa498bb2d 100644 (file)
--- a/Command.cpp
+++ b/Command.cpp
@@ -8,8 +8,10 @@
 #include "ResourceTable.h"
 #include "XMLNode.h"
 
 #include "ResourceTable.h"
 #include "XMLNode.h"
 

-#include <utils.h>
-#include <utils/ZipFile.h>
+#include <utils/Log.h>
+#include <utils/threads.h>
+#include <utils/List.h>
+#include <utils/Errors.h>

 
 #include <fcntl.h>
 #include <errno.h>
 
 #include <fcntl.h>
 #include <errno.h>


@@ -190,15 +192,15 @@ int doList(Bundle* bundle)
             fprintf(stderr, "ERROR: list -a failed because assets could not be loaded\n");
             goto bail;
         }
             fprintf(stderr, "ERROR: list -a failed because assets could not be loaded\n");
             goto bail;
         }

-        
+

         const ResTable& res = assets.getResources(false);
         if (&res == NULL) {
             printf("\nNo resource table found.\n");
         } else {
             printf("\nResource table:\n");
         const ResTable& res = assets.getResources(false);
         if (&res == NULL) {
             printf("\nNo resource table found.\n");
         } else {
             printf("\nResource table:\n");

-            res.print();
+            res.print(false);

         }
         }

-        
+

         Asset* manifestAsset = assets.openNonAsset("AndroidManifest.xml",
                                                    Asset::ACCESS_BUFFER);
         if (manifestAsset == NULL) {
         Asset* manifestAsset = assets.openNonAsset("AndroidManifest.xml",
                                                    Asset::ACCESS_BUFFER);
         if (manifestAsset == NULL) {


@@ -212,7 +214,7 @@ int doList(Bundle* bundle)
         }
         delete manifestAsset;
     }
         }
         delete manifestAsset;
     }

-    
+

     result = 0;
 
 bail:
     result = 0;
 
 bail:


@@ -268,17 +270,19 @@ static String8 getAttribute(const ResXMLTree& tree, uint32_t attrRes, String8* o
     return str ? String8(str, len) : String8();
 }
 
     return str ? String8(str, len) : String8();
 }
 

-static int32_t getIntegerAttribute(const ResXMLTree& tree, uint32_t attrRes, String8* outError)
+static int32_t getIntegerAttribute(const ResXMLTree& tree, uint32_t attrRes,
+        String8* outError, int32_t defValue = -1)

 {
     ssize_t idx = indexOfAttribute(tree, attrRes);
     if (idx < 0) {
 {
     ssize_t idx = indexOfAttribute(tree, attrRes);
     if (idx < 0) {

-        return -1;
+        return defValue;

     }
     Res_value value;
     if (tree.getAttributeValue(idx, &value) != NO_ERROR) {
     }
     Res_value value;
     if (tree.getAttributeValue(idx, &value) != NO_ERROR) {

-        if (value.dataType != Res_value::TYPE_INT_DEC) {
+        if (value.dataType < Res_value::TYPE_FIRST_INT
+                || value.dataType > Res_value::TYPE_LAST_INT) {

             if (outError != NULL) *outError = "attribute is not an integer value";
             if (outError != NULL) *outError = "attribute is not an integer value";

-            return -1;
+            return defValue;

         }
     }
     return value.data;
         }
     }
     return value.data;


@@ -318,8 +322,34 @@ enum {
     VERSION_NAME_ATTR = 0x0101021c,
     LABEL_ATTR = 0x01010001,
     ICON_ATTR = 0x01010002,
     VERSION_NAME_ATTR = 0x0101021c,
     LABEL_ATTR = 0x01010001,
     ICON_ATTR = 0x01010002,

+    MIN_SDK_VERSION_ATTR = 0x0101020c,
+    REQ_TOUCH_SCREEN_ATTR = 0x01010227,
+    REQ_KEYBOARD_TYPE_ATTR = 0x01010228,
+    REQ_HARD_KEYBOARD_ATTR = 0x01010229,
+    REQ_NAVIGATION_ATTR = 0x0101022a,
+    REQ_FIVE_WAY_NAV_ATTR = 0x01010232,
+    TARGET_SDK_VERSION_ATTR = 0x01010270,
+    TEST_ONLY_ATTR = 0x01010272,
+    DENSITY_ATTR = 0x0101026c,
+    SMALL_SCREEN_ATTR = 0x01010284,
+    NORMAL_SCREEN_ATTR = 0x01010285,
+    LARGE_SCREEN_ATTR = 0x01010286,

 };
 
 };
 

+const char *getComponentName(String8 &pkgName, String8 &componentName) {
+    ssize_t idx = componentName.find(".");
+    String8 retStr(pkgName);
+    if (idx == 0) {
+        retStr += componentName;
+    } else if (idx < 0) {
+        retStr += ".";
+        retStr += componentName;
+    } else {
+        return componentName.string();
+    }
+    return retStr.string();
+}
+

 /*
  * Handle the "dump" command, to extract select data from an archive.
  */
 /*
  * Handle the "dump" command, to extract select data from an archive.
  */


@@ -327,41 +357,42 @@ int doDump(Bundle* bundle)
 {
     status_t result = UNKNOWN_ERROR;
     Asset* asset = NULL;
 {
     status_t result = UNKNOWN_ERROR;
     Asset* asset = NULL;

-    
+

     if (bundle->getFileSpecCount() < 1) {
         fprintf(stderr, "ERROR: no dump option specified\n");
         return 1;
     }
     if (bundle->getFileSpecCount() < 1) {
         fprintf(stderr, "ERROR: no dump option specified\n");
         return 1;
     }

-    
+

     if (bundle->getFileSpecCount() < 2) {
         fprintf(stderr, "ERROR: no dump file specified\n");
         return 1;
     }
     if (bundle->getFileSpecCount() < 2) {
         fprintf(stderr, "ERROR: no dump file specified\n");
         return 1;
     }

-    
+

     const char* option = bundle->getFileSpecEntry(0);
     const char* filename = bundle->getFileSpecEntry(1);
     const char* option = bundle->getFileSpecEntry(0);
     const char* filename = bundle->getFileSpecEntry(1);

-    
+

     AssetManager assets;
     AssetManager assets;

-    if (!assets.addAssetPath(String8(filename), NULL)) {
+    void* assetsCookie;
+    if (!assets.addAssetPath(String8(filename), &assetsCookie)) {

         fprintf(stderr, "ERROR: dump failed because assets could not be loaded\n");
         return 1;
     }
         fprintf(stderr, "ERROR: dump failed because assets could not be loaded\n");
         return 1;
     }

-    
+

     const ResTable& res = assets.getResources(false);
     if (&res == NULL) {
         fprintf(stderr, "ERROR: dump failed because no resource table was found\n");
         goto bail;
     }
     const ResTable& res = assets.getResources(false);
     if (&res == NULL) {
         fprintf(stderr, "ERROR: dump failed because no resource table was found\n");
         goto bail;
     }

-    
+

     if (strcmp("resources", option) == 0) {
     if (strcmp("resources", option) == 0) {

-        res.print();
-        
+        res.print(bundle->getValues());
+

     } else if (strcmp("xmltree", option) == 0) {
         if (bundle->getFileSpecCount() < 3) {
             fprintf(stderr, "ERROR: no dump xmltree resource file specified\n");
             goto bail;
         }
     } else if (strcmp("xmltree", option) == 0) {
         if (bundle->getFileSpecCount() < 3) {
             fprintf(stderr, "ERROR: no dump xmltree resource file specified\n");
             goto bail;
         }

-    
+

         for (int i=2; i<bundle->getFileSpecCount(); i++) {
             const char* resname = bundle->getFileSpecEntry(i);
             ResXMLTree tree;
         for (int i=2; i<bundle->getFileSpecCount(); i++) {
             const char* resname = bundle->getFileSpecEntry(i);
             ResXMLTree tree;


@@ -370,7 +401,7 @@ int doDump(Bundle* bundle)
                 fprintf(stderr, "ERROR: dump failed because resource %p found\n", resname);
                 goto bail;
             }
                 fprintf(stderr, "ERROR: dump failed because resource %p found\n", resname);
                 goto bail;
             }

-            
+

             if (tree.setTo(asset->getBuffer(true),
                            asset->getLength()) != NO_ERROR) {
                 fprintf(stderr, "ERROR: Resource %s is corrupt\n", resname);
             if (tree.setTo(asset->getBuffer(true),
                            asset->getLength()) != NO_ERROR) {
                 fprintf(stderr, "ERROR: Resource %s is corrupt\n", resname);


@@ -381,13 +412,13 @@ int doDump(Bundle* bundle)
             delete asset;
             asset = NULL;
         }
             delete asset;
             asset = NULL;
         }

-        
+

     } else if (strcmp("xmlstrings", option) == 0) {
         if (bundle->getFileSpecCount() < 3) {
             fprintf(stderr, "ERROR: no dump xmltree resource file specified\n");
             goto bail;
         }
     } else if (strcmp("xmlstrings", option) == 0) {
         if (bundle->getFileSpecCount() < 3) {
             fprintf(stderr, "ERROR: no dump xmltree resource file specified\n");
             goto bail;
         }

-    
+

         for (int i=2; i<bundle->getFileSpecCount(); i++) {
             const char* resname = bundle->getFileSpecEntry(i);
             ResXMLTree tree;
         for (int i=2; i<bundle->getFileSpecCount(); i++) {
             const char* resname = bundle->getFileSpecEntry(i);
             ResXMLTree tree;


@@ -396,7 +427,7 @@ int doDump(Bundle* bundle)
                 fprintf(stderr, "ERROR: dump failed because resource %p found\n", resname);
                 goto bail;
             }
                 fprintf(stderr, "ERROR: dump failed because resource %p found\n", resname);
                 goto bail;
             }

-            
+

             if (tree.setTo(asset->getBuffer(true),
                            asset->getLength()) != NO_ERROR) {
                 fprintf(stderr, "ERROR: Resource %s is corrupt\n", resname);
             if (tree.setTo(asset->getBuffer(true),
                            asset->getLength()) != NO_ERROR) {
                 fprintf(stderr, "ERROR: Resource %s is corrupt\n", resname);


@@ -406,7 +437,7 @@ int doDump(Bundle* bundle)
             delete asset;
             asset = NULL;
         }
             delete asset;
             asset = NULL;
         }

-        
+

     } else {
         ResXMLTree tree;
         asset = assets.openNonAsset("AndroidManifest.xml",
     } else {
         ResXMLTree tree;
         asset = assets.openNonAsset("AndroidManifest.xml",


@@ -415,14 +446,14 @@ int doDump(Bundle* bundle)
             fprintf(stderr, "ERROR: dump failed because no AndroidManifest.xml found\n");
             goto bail;
         }
             fprintf(stderr, "ERROR: dump failed because no AndroidManifest.xml found\n");
             goto bail;
         }

-        
+

         if (tree.setTo(asset->getBuffer(true),
                        asset->getLength()) != NO_ERROR) {
             fprintf(stderr, "ERROR: AndroidManifest.xml is corrupt\n");
             goto bail;
         }
         tree.restart();
         if (tree.setTo(asset->getBuffer(true),
                        asset->getLength()) != NO_ERROR) {
             fprintf(stderr, "ERROR: AndroidManifest.xml is corrupt\n");
             goto bail;
         }
         tree.restart();

-        
+

         if (strcmp("permissions", option) == 0) {
             size_t len;
             ResXMLTree::event_code_t code;
         if (strcmp("permissions", option) == 0) {
             size_t len;
             ResXMLTree::event_code_t code;


@@ -471,9 +502,17 @@ int doDump(Bundle* bundle)
             bool withinActivity = false;
             bool isMainActivity = false;
             bool isLauncherActivity = false;
             bool withinActivity = false;
             bool isMainActivity = false;
             bool isLauncherActivity = false;

+            bool withinApplication = false;
+            bool withinReceiver = false;
+            int targetSdk = 0;
+            int smallScreen = 1;
+            int normalScreen = 1;
+            int largeScreen = 1;
+            String8 pkg;

             String8 activityName;
             String8 activityLabel;
             String8 activityIcon;
             String8 activityName;
             String8 activityLabel;
             String8 activityIcon;

+            String8 receiverName;

             while ((code=tree.next()) != ResXMLTree::END_DOCUMENT && code != ResXMLTree::BAD_DOCUMENT) {
                 if (code == ResXMLTree::END_TAG) {
                     depth--;
             while ((code=tree.next()) != ResXMLTree::END_DOCUMENT && code != ResXMLTree::BAD_DOCUMENT) {
                 if (code == ResXMLTree::END_TAG) {
                     depth--;


@@ -490,7 +529,7 @@ int doDump(Bundle* bundle)
                         fprintf(stderr, "ERROR: manifest does not start with <manifest> tag\n");
                         goto bail;
                     }
                         fprintf(stderr, "ERROR: manifest does not start with <manifest> tag\n");
                         goto bail;
                     }

-                    String8 pkg = getAttribute(tree, NULL, "package", NULL);
+                    pkg = getAttribute(tree, NULL, "package", NULL);

                     printf("package: name='%s' ", pkg.string());
                     int32_t versionCode = getIntegerAttribute(tree, VERSION_CODE_ATTR, &error);
                     if (error != "") {
                     printf("package: name='%s' ", pkg.string());
                     int32_t versionCode = getIntegerAttribute(tree, VERSION_CODE_ATTR, &error);
                     if (error != "") {


@@ -508,69 +547,193 @@ int doDump(Bundle* bundle)
                         goto bail;
                     }
                     printf("versionName='%s'\n", versionName.string());
                         goto bail;
                     }
                     printf("versionName='%s'\n", versionName.string());

-                } else if (depth == 2 && tag == "application") {
-                    String8 label = getResolvedAttribute(&res, tree, LABEL_ATTR, &error);
-                    if (error != "") {
-                        fprintf(stderr, "ERROR getting 'android:label' attribute: %s\n", error.string());
-                        goto bail;
-                    }
-                    printf("application: label='%s' ", label.string());
-
-                    String8 icon = getResolvedAttribute(&res, tree, ICON_ATTR, &error);
-                    if (error != "") {
-                        fprintf(stderr, "ERROR getting 'android:icon' attribute: %s\n", error.string());
-                        goto bail;
-                    }
-                    printf("icon='%s'\n", icon.string());
-                } else if (depth == 3 && tag == "activity") {
-                    withinActivity = true;
-                    //printf("LOG: withinActivity==true\n");
-
-                    activityName = getAttribute(tree, NAME_ATTR, &error);
-                    if (error != "") {
-                        fprintf(stderr, "ERROR getting 'android:name' attribute: %s\n", error.string());
-                        goto bail;
+                } else if (depth == 2) {
+                    withinApplication = false;
+                    if (tag == "application") {
+                        withinApplication = true;
+                        String8 label = getResolvedAttribute(&res, tree, LABEL_ATTR, &error);
+                         if (error != "") {
+                             fprintf(stderr, "ERROR getting 'android:label' attribute: %s\n", error.string());
+                             goto bail;
+                        }
+                        printf("application: label='%s' ", label.string());
+                        String8 icon = getResolvedAttribute(&res, tree, ICON_ATTR, &error);
+                        if (error != "") {
+                            fprintf(stderr, "ERROR getting 'android:icon' attribute: %s\n", error.string());
+                            goto bail;
+                        }
+                        printf("icon='%s'\n", icon.string());
+                        int32_t testOnly = getIntegerAttribute(tree, TEST_ONLY_ATTR, &error, 0);
+                        if (error != "") {
+                            fprintf(stderr, "ERROR getting 'android:testOnly' attribute: %s\n", error.string());
+                            goto bail;
+                        }
+                        if (testOnly != 0) {
+                            printf("testOnly='%d'\n", testOnly);
+                        }
+                    } else if (tag == "uses-sdk") {
+                        int32_t code = getIntegerAttribute(tree, MIN_SDK_VERSION_ATTR, &error);
+                        if (error != "") {
+                            error = "";
+                            String8 name = getResolvedAttribute(&res, tree, MIN_SDK_VERSION_ATTR, &error);
+                            if (error != "") {
+                                fprintf(stderr, "ERROR getting 'android:minSdkVersion' attribute: %s\n",
+                                        error.string());
+                                goto bail;
+                            }
+                            if (name == "Donut") targetSdk = 4;
+                            printf("sdkVersion:'%s'\n", name.string());
+                        } else if (code != -1) {
+                            targetSdk = code;
+                            printf("sdkVersion:'%d'\n", code);
+                        }
+                        code = getIntegerAttribute(tree, TARGET_SDK_VERSION_ATTR, &error);
+                        if (error != "") {
+                            error = "";
+                            String8 name = getResolvedAttribute(&res, tree, TARGET_SDK_VERSION_ATTR, &error);
+                            if (error != "") {
+                                fprintf(stderr, "ERROR getting 'android:targetSdkVersion' attribute: %s\n",
+                                        error.string());
+                                goto bail;
+                            }
+                            if (name == "Donut" && targetSdk < 4) targetSdk = 4;
+                            printf("targetSdkVersion:'%s'\n", name.string());
+                        } else if (code != -1) {
+                            if (targetSdk < code) {
+                                targetSdk = code;
+                            }
+                            printf("targetSdkVersion:'%d'\n", code);
+                        }
+                    } else if (tag == "uses-configuration") {
+                        int32_t reqTouchScreen = getIntegerAttribute(tree,
+                                REQ_TOUCH_SCREEN_ATTR, NULL, 0);
+                        int32_t reqKeyboardType = getIntegerAttribute(tree,
+                                REQ_KEYBOARD_TYPE_ATTR, NULL, 0);
+                        int32_t reqHardKeyboard = getIntegerAttribute(tree,
+                                REQ_HARD_KEYBOARD_ATTR, NULL, 0);
+                        int32_t reqNavigation = getIntegerAttribute(tree,
+                                REQ_NAVIGATION_ATTR, NULL, 0);
+                        int32_t reqFiveWayNav = getIntegerAttribute(tree,
+                                REQ_FIVE_WAY_NAV_ATTR, NULL, 0);
+                        printf("uses-configuation:");
+                        if (reqTouchScreen != 0) {
+                            printf(" reqTouchScreen='%d'", reqTouchScreen);
+                        }
+                        if (reqKeyboardType != 0) {
+                            printf(" reqKeyboardType='%d'", reqKeyboardType);
+                        }
+                        if (reqHardKeyboard != 0) {
+                            printf(" reqHardKeyboard='%d'", reqHardKeyboard);
+                        }
+                        if (reqNavigation != 0) {
+                            printf(" reqNavigation='%d'", reqNavigation);
+                        }
+                        if (reqFiveWayNav != 0) {
+                            printf(" reqFiveWayNav='%d'", reqFiveWayNav);
+                        }
+                        printf("\n");
+                    } else if (tag == "supports-density") {
+                        int32_t dens = getIntegerAttribute(tree, DENSITY_ATTR, &error);
+                        if (error != "") {
+                            fprintf(stderr, "ERROR getting 'android:density' attribute: %s\n",
+                                    error.string());
+                            goto bail;
+                        }
+                        printf("supports-density:'%d'\n", dens);
+                    } else if (tag == "supports-screens") {
+                        smallScreen = getIntegerAttribute(tree,
+                                SMALL_SCREEN_ATTR, NULL, 1);
+                        normalScreen = getIntegerAttribute(tree,
+                                NORMAL_SCREEN_ATTR, NULL, 1);
+                        largeScreen = getIntegerAttribute(tree,
+                                LARGE_SCREEN_ATTR, NULL, 1);

                     }
                     }

+                } else if (depth == 3 && withinApplication) {
+                    withinActivity = false;
+                    withinReceiver = false;
+                    if(tag == "activity") {
+                        withinActivity = true;
+                        activityName = getAttribute(tree, NAME_ATTR, &error);
+                        if (error != "") {
+                            fprintf(stderr, "ERROR getting 'android:name' attribute: %s\n", error.string());
+                            goto bail;
+                        }

 
 

-                    activityLabel = getResolvedAttribute(&res, tree, LABEL_ATTR, &error);
-                    if (error != "") {
-                        fprintf(stderr, "ERROR getting 'android:label' attribute: %s\n", error.string());
-                        goto bail;
-                    }
+                        activityLabel = getResolvedAttribute(&res, tree, LABEL_ATTR, &error);
+                        if (error != "") {
+                            fprintf(stderr, "ERROR getting 'android:label' attribute: %s\n", error.string());
+                            goto bail;
+                        }

 
 

-                    activityIcon = getResolvedAttribute(&res, tree, ICON_ATTR, &error);
-                    if (error != "") {
-                        fprintf(stderr, "ERROR getting 'android:icon' attribute: %s\n", error.string());
-                        goto bail;
-                    }
-                } else if (depth == 5 && withinActivity) {
-                    if (tag == "action") {
-                        //printf("LOG: action tag\n");
-                        String8 action = getAttribute(tree, NAME_ATTR, &error);
+                        activityIcon = getResolvedAttribute(&res, tree, ICON_ATTR, &error);

                         if (error != "") {
                         if (error != "") {

-                            fprintf(stderr, "ERROR getting 'android:name' attribute: %s\n", error.string());
+                            fprintf(stderr, "ERROR getting 'android:icon' attribute: %s\n", error.string());

                             goto bail;
                         }
                             goto bail;
                         }

-                        if (action == "android.intent.action.MAIN") {
-                            isMainActivity = true;
-                            //printf("LOG: isMainActivity==true\n");
+                    } else if (tag == "uses-library") {
+                        String8 libraryName = getAttribute(tree, NAME_ATTR, &error);
+                        if (error != "") {
+                            fprintf(stderr, "ERROR getting 'android:name' attribute for uses-library: %s\n", error.string());
+                            goto bail;

                         }
                         }

-                    } else if (tag == "category") {
-                        String8 category = getAttribute(tree, NAME_ATTR, &error);
+                        printf("uses-library:'%s'\n", libraryName.string());
+                    } else if (tag == "receiver") {
+                        withinReceiver = true;
+                        receiverName = getAttribute(tree, NAME_ATTR, &error);
+

                         if (error != "") {
                         if (error != "") {

-                            fprintf(stderr, "ERROR getting 'name' attribute: %s\n", error.string());
+                            fprintf(stderr, "ERROR getting 'android:name' attribute for receiver: %s\n", error.string());

                             goto bail;
                         }
                             goto bail;
                         }

-                        if (category == "android.intent.category.LAUNCHER") {
-                            isLauncherActivity = true;
-                            //printf("LOG: isLauncherActivity==true\n");
-                       }
+                    }
+                } else if (depth == 5) {
+                    if (withinActivity) {
+                        if (tag == "action") {
+                            //printf("LOG: action tag\n");
+                            String8 action = getAttribute(tree, NAME_ATTR, &error);
+                            if (error != "") {
+                                fprintf(stderr, "ERROR getting 'android:name' attribute: %s\n", error.string());
+                                goto bail;
+                            }
+                            if (action == "android.intent.action.MAIN") {
+                                isMainActivity = true;
+                                //printf("LOG: isMainActivity==true\n");
+                            }
+                        } else if (tag == "category") {
+                            String8 category = getAttribute(tree, NAME_ATTR, &error);
+                            if (error != "") {
+                                fprintf(stderr, "ERROR getting 'name' attribute: %s\n", error.string());
+                                goto bail;
+                            }
+                            if (category == "android.intent.category.LAUNCHER") {
+                                isLauncherActivity = true;
+                                //printf("LOG: isLauncherActivity==true\n");
+                            }
+                        }
+                    } else if (withinReceiver) {
+                        if (tag == "action") {
+                            String8 action = getAttribute(tree, NAME_ATTR, &error);
+                            if (error != "") {
+                                fprintf(stderr, "ERROR getting 'android:name' attribute for receiver: %s\n", error.string());
+                                goto bail;
+                            }
+                            if (action == "android.appwidget.action.APPWIDGET_UPDATE") {
+                                const char *rName = getComponentName(pkg, receiverName);
+                                if (rName != NULL) {
+                                    printf("gadget-receiver:'%s/%s'\n", pkg.string(), rName);
+                                }
+                            }
+                        }

                     }
                 }
 
                     }
                 }
 

+                if (depth < 2) {
+                    withinApplication = false;
+                }

                 if (depth < 3) {
                     //if (withinActivity) printf("LOG: withinActivity==false\n");
                     withinActivity = false;
                 if (depth < 3) {
                     //if (withinActivity) printf("LOG: withinActivity==false\n");
                     withinActivity = false;

+                    withinReceiver = false;

                 }
 
                 if (depth < 5) {
                 }
 
                 if (depth < 5) {


@@ -581,11 +744,77 @@ int doDump(Bundle* bundle)
                 }
 
                 if (withinActivity && isMainActivity && isLauncherActivity) {
                 }
 
                 if (withinActivity && isMainActivity && isLauncherActivity) {

-                    printf("launchable activity: name='%s' label='%s' icon='%s'\n",
-                           activityName.string(), activityLabel.string(),
+                    printf("launchable activity:");
+                    const char *aName = getComponentName(pkg, activityName);
+                    if (aName != NULL) {
+                        printf(" name='%s'", aName);
+                    }
+                    printf("label='%s' icon='%s'\n",
+                           activityLabel.string(),

                            activityIcon.string());
                 }
             }
                            activityIcon.string());
                 }
             }

+            
+            // Determine default values for any unspecified screen sizes,
+            // based on the target SDK of the package.  As of 4 (donut)
+            // the screen size support was introduced, so all default to
+            // enabled.
+            if (smallScreen > 0) {
+                smallScreen = targetSdk >= 4 ? -1 : 0;
+            }
+            if (normalScreen > 0) {
+                normalScreen = -1;
+            }
+            if (largeScreen > 0) {
+                largeScreen = targetSdk >= 4 ? -1 : 0;
+            }
+            printf("supports-screens:");
+            if (smallScreen != 0) printf(" 'small'");
+            if (normalScreen != 0) printf(" 'normal'");
+            if (largeScreen != 0) printf(" 'large'");
+            printf("\n");
+            
+            printf("locales:");
+            Vector<String8> locales;
+            res.getLocales(&locales);
+            const size_t NL = locales.size();
+            for (size_t i=0; i<NL; i++) {
+                const char* localeStr =  locales[i].string();
+                if (localeStr == NULL || strlen(localeStr) == 0) {
+                    localeStr = "--_--";
+                }
+                printf(" '%s'", localeStr);
+            }
+            printf("\n");
+            
+            Vector<ResTable_config> configs;
+            res.getConfigurations(&configs);
+            SortedVector<int> densities;
+            const size_t NC = configs.size();
+            for (size_t i=0; i<NC; i++) {
+                int dens = configs[i].density;
+                if (dens == 0) dens = 160;
+                densities.add(dens);
+            }
+            
+            printf("densities:");
+            const size_t ND = densities.size();
+            for (size_t i=0; i<ND; i++) {
+                printf(" '%d'", densities[i]);
+            }
+            printf("\n");
+            
+            AssetDir* dir = assets.openNonAssetDir(assetsCookie, "lib");
+            if (dir != NULL) {
+                if (dir->getFileCount() > 0) {
+                    printf("native-code:");
+                    for (size_t i=0; i<dir->getFileCount(); i++) {
+                        printf(" '%s'", dir->getFileName(i).string());
+                    }
+                    printf("\n");
+                }
+                delete dir;
+            }

         } else if (strcmp("configurations", option) == 0) {
             Vector<ResTable_config> configs;
             res.getConfigurations(&configs);
         } else if (strcmp("configurations", option) == 0) {
             Vector<ResTable_config> configs;
             res.getConfigurations(&configs);


@@ -600,7 +829,7 @@ int doDump(Bundle* bundle)
     }
 
     result = NO_ERROR;
     }
 
     result = NO_ERROR;

-    
+

 bail:
     if (asset) {
         delete asset;
 bail:
     if (asset) {
         delete asset;


@@ -749,7 +978,7 @@ int doPackage(Bundle* bundle)
     }
 
     N = bundle->getFileSpecCount();
     }
 
     N = bundle->getFileSpecCount();

-    if (N < 1 && bundle->getResourceSourceDir() == NULL && bundle->getJarFiles().size() == 0
+    if (N < 1 && bundle->getResourceSourceDirs().size() == 0 && bundle->getJarFiles().size() == 0

             && bundle->getAndroidManifestFile() == NULL && bundle->getAssetSourceDir() == NULL) {
         fprintf(stderr, "ERROR: no input files\n");
         goto bail;
             && bundle->getAndroidManifestFile() == NULL && bundle->getAssetSourceDir() == NULL) {
         fprintf(stderr, "ERROR: no input files\n");
         goto bail;


@@ -781,7 +1010,7 @@ int doPackage(Bundle* bundle)
     }
 
     // If they asked for any files that need to be compiled, do so.
     }
 
     // If they asked for any files that need to be compiled, do so.

-    if (bundle->getResourceSourceDir() || bundle->getAndroidManifestFile()) {
+    if (bundle->getResourceSourceDirs().size() || bundle->getAndroidManifestFile()) {

         err = buildResources(bundle, assets);
         if (err != 0) {
             goto bail;
         err = buildResources(bundle, assets);
         if (err != 0) {
             goto bail;