From: Jean-Baptiste Queru <jbq@google.com>
Date: Thu, 3 Sep 2009 22:18:14 +0000 (-0700)
Subject: merge from donut
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/811c16f33b5cbd60df68bf0d087c4fdfdaa87ceb?hp=-c

merge from donut
---

811c16f33b5cbd60df68bf0d087c4fdfdaa87ceb
diff --combined Command.cpp
index 79e6641,5f80ade..7e6a12c
--- a/Command.cpp
+++ b/Command.cpp
@@@ -321,6 -321,7 +321,7 @@@ enum 
      LABEL_ATTR = 0x01010001,
      ICON_ATTR = 0x01010002,
      MIN_SDK_VERSION_ATTR = 0x0101020c,
+     MAX_SDK_VERSION_ATTR = 0x01010271,
      REQ_TOUCH_SCREEN_ATTR = 0x01010227,
      REQ_KEYBOARD_TYPE_ATTR = 0x01010228,
      REQ_HARD_KEYBOARD_ATTR = 0x01010229,
@@@ -396,7 -397,7 +397,7 @@@ int doDump(Bundle* bundle
              ResXMLTree tree;
              asset = assets.openNonAsset(resname, Asset::ACCESS_BUFFER);
              if (asset == NULL) {
 -                fprintf(stderr, "ERROR: dump failed because resource %p found\n", resname);
 +                fprintf(stderr, "ERROR: dump failed because resource %s found\n", resname);
                  goto bail;
              }
  
@@@ -422,7 -423,7 +423,7 @@@
              ResXMLTree tree;
              asset = assets.openNonAsset(resname, Asset::ACCESS_BUFFER);
              if (asset == NULL) {
 -                fprintf(stderr, "ERROR: dump failed because resource %p found\n", resname);
 +                fprintf(stderr, "ERROR: dump failed because resource %s found\n", resname);
                  goto bail;
              }
  
@@@ -585,6 -586,10 +586,10 @@@
                              targetSdk = code;
                              printf("sdkVersion:'%d'\n", code);
                          }
+                         code = getIntegerAttribute(tree, MAX_SDK_VERSION_ATTR, NULL, -1);
+                         if (code != -1) {
+                             printf("maxSdkVersion:'%d'\n", code);
+                         }
                          code = getIntegerAttribute(tree, TARGET_SDK_VERSION_ATTR, &error);
                          if (error != "") {
                              error = "";