am b4649ec7: am 23827557: Merge "Add a --debug-mode option to aapt." into gingerbread

Merge commit 'b4649ec720fa959b700a7a03c089bfdc61321d16'

* commit 'b4649ec720fa959b700a7a03c089bfdc61321d16':
  Add a --debug-mode option to aapt.

diff --combined Resource.cpp
index 498b1937273fd2dac74e8a65846a2e0f8dfecbb9,9c5fcda2bcf0dd5aa3484bcfd4cffc66addad881..01728a17477e1752280acf66ad6ebc613d2fcc5d
--- 1/Resource.cpp
--- 2/Resource.cpp
+++ b/Resource.cpp
@@@ -542,11 -542,11 +542,11 @@@ static bool applyFileOverlay(Bundle *bu
                          DefaultKeyedVector<AaptGroupEntry, sp<AaptFile> > baseFiles =
                                  baseGroup->getFiles();
                          for (size_t i=0; i < baseFiles.size(); i++) {
 -                            printf("baseFile %ld has flavor %s\n", i,
 +                            printf("baseFile %d has flavor %s\n", i,
                                      baseFiles.keyAt(i).toString().string());
                          }
                          for (size_t i=0; i < overlayFiles.size(); i++) {
 -                            printf("overlayFile %ld has flavor %s\n", i,
 +                            printf("overlayFile %d has flavor %s\n", i,
                                      overlayFiles.keyAt(i).toString().string());
                          }
                      }
@@@ -560,7 -560,7 +560,7 @@@
                                  keyAt(overlayGroupIndex));
                          if(baseFileIndex < UNKNOWN_ERROR) {
                              if (bundle->getVerbose()) {
 -                                printf("found a match (%ld) for overlay file %s, for flavor %s\n",
 +                                printf("found a match (%d) for overlay file %s, for flavor %s\n",
                                          baseFileIndex,
                                          overlayGroup->getLeaf().string(),
                                          overlayFiles.keyAt(overlayGroupIndex).toString().string());
@@@ -678,6 -678,13 +678,13 @@@ status_t massageManifest(Bundle* bundle
                  bundle->getMaxSdkVersion());
      }
  
+     if (bundle->getDebugMode()) {
+         sp<XMLNode> application = root->getChildElement(String16(), String16("application"));
+         if (application != NULL) {
+             addTagAttribute(application, RESOURCES_ANDROID_NAMESPACE, "debuggable", "true");
+         }
+     }
+ 
      // Deal with manifest package name overrides
      const char* manifestPackageNameOverride = bundle->getManifestPackageNameOverride();
      if (manifestPackageNameOverride != NULL) {
@@@ -2074,13 -2081,12 +2081,13 @@@ writeProguardForLayouts(ProguardKeepSet
      // tag:attribute pairs that should be checked in layout files.
      KeyedVector<String8, NamespaceAttributePair> kLayoutTagAttrPairs;
      addTagAttrPair(&kLayoutTagAttrPairs, "view", NULL, "class");
 +    addTagAttrPair(&kLayoutTagAttrPairs, "fragment", NULL, "class");
      addTagAttrPair(&kLayoutTagAttrPairs, "fragment", RESOURCES_ANDROID_NAMESPACE, "name");
  
      // tag:attribute pairs that should be checked in xml files.
      KeyedVector<String8, NamespaceAttributePair> kXmlTagAttrPairs;
      addTagAttrPair(&kXmlTagAttrPairs, "PreferenceScreen", RESOURCES_ANDROID_NAMESPACE, "fragment");
 -    addTagAttrPair(&kXmlTagAttrPairs, "Header", RESOURCES_ANDROID_NAMESPACE, "fragment");
 +    addTagAttrPair(&kXmlTagAttrPairs, "header", RESOURCES_ANDROID_NAMESPACE, "fragment");
  
      const Vector<sp<AaptDir> >& dirs = assets->resDirs();
      const size_t K = dirs.size();