From: Scott Main <smain@google.com>
Date: Sat, 6 Nov 2010 23:24:28 +0000 (-0700)
Subject: am 4da6efc8: am 46151652: Merge "fix xlarge support in aapt for gingerbread" into... 
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/174b814c17a1d3e80534db7949b6f49b51756128?ds=inline;hp=-c

am 4da6efc8: am 46151652: Merge "fix xlarge support in aapt for gingerbread" into gingerbread

* commit '4da6efc8a3ecfcf46a8988ad1d277ae00ed1f58c':
  fix xlarge support in aapt for gingerbread
---

174b814c17a1d3e80534db7949b6f49b51756128
diff --combined Command.cpp
index e9833c9,661ecb1..16fa95a
--- a/Command.cpp
+++ b/Command.cpp
@@@ -198,10 -198,8 +198,10 @@@ int doList(Bundle* bundle
          if (&res == NULL) {
              printf("\nNo resource table found.\n");
          } else {
 +#ifndef HAVE_ANDROID_OS
              printf("\nResource table:\n");
              res.print(false);
 +#endif
          }
  
          Asset* manifestAsset = assets.openNonAsset("AndroidManifest.xml",
@@@ -430,9 -428,8 +430,9 @@@ int doDump(Bundle* bundle
      }
  
      if (strcmp("resources", option) == 0) {
 +#ifndef HAVE_ANDROID_OS
          res.print(bundle->getValues());
 -
 +#endif
      } else if (strcmp("xmltree", option) == 0) {
          if (bundle->getFileSpecCount() < 3) {
              fprintf(stderr, "ERROR: no dump xmltree resource file specified\n");
@@@ -1142,8 -1139,8 +1142,8 @@@
                  largeScreen = targetSdk >= 4 ? -1 : 0;
              }
              if (xlargeScreen > 0) {
-                 // Introduced in Honeycomb.
-                 xlargeScreen = targetSdk >= 10 ? -1 : 0;
+                 // Introduced in Gingerbread.
+                 xlargeScreen = targetSdk >= 9 ? -1 : 0;
              }
              if (anyDensity > 0) {
                  anyDensity = targetSdk >= 4 ? -1 : 0;