]> git.saurik.com Git - android/aapt.git/commitdiff
am 75c49842: Add maxSdkVersion information in dump badging option
authorSuchi Amalapurapu <asuchitra@google.com>
Tue, 18 Aug 2009 17:59:08 +0000 (10:59 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 18 Aug 2009 17:59:08 +0000 (10:59 -0700)
Merge commit '75c498426a17b47d445711bb9e36794b05876a56' into eclair

* commit '75c498426a17b47d445711bb9e36794b05876a56':
  Add maxSdkVersion information in dump badging option

1  2 
Command.cpp

diff --combined Command.cpp
index c0ae592f669269ded8566981800a908fa498bb2d,5f80ade3a77e46cf5fced2ede01387993baf5b00..76a5acdb4c6f0aadbdb5271c1f3a80fb61268e9a
@@@ -8,10 -8,8 +8,10 @@@
  #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>
@@@ -323,6 -321,7 +323,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,
@@@ -587,6 -586,10 +588,10 @@@ int doDump(Bundle* bundle
                              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 = "";