X-Git-Url: https://git.saurik.com/android/aapt.git/blobdiff_plain/c28d2500b146d5631edea28e4f4864c6d5b1b915..98749835c8a75f60e3ff6e35c8ae62d11924effc:/Command.cpp diff --git a/Command.cpp b/Command.cpp index ad0465d..8ac7590 100644 --- a/Command.cpp +++ b/Command.cpp @@ -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", @@ -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"); @@ -904,10 +907,10 @@ int doDump(Bundle* bundle) error.string()); goto bail; } - } else if (tag == "uses-gl-texture") { + } else if (tag == "supports-gl-texture") { String8 name = getAttribute(tree, NAME_ATTR, &error); if (name != "" && error == "") { - printf("uses-gl-texture:'%s'\n", name.string()); + printf("supports-gl-texture:'%s'\n", name.string()); } else { fprintf(stderr, "ERROR getting 'android:name' attribute: %s\n", error.string()); @@ -1139,8 +1142,8 @@ int doDump(Bundle* bundle) 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;