]> git.saurik.com Git - android/aapt.git/commitdiff
am b5ef7ee1: Default to UTF8 resources when packaging with aapt
authorKenny Root <kroot@google.com>
Fri, 11 Dec 2009 04:23:04 +0000 (20:23 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 11 Dec 2009 04:23:04 +0000 (20:23 -0800)
Merge commit 'b5ef7ee1644b099498ddd29c1d051e7ee26ccfd3' into eclair-mr2-plus-aosp

* commit 'b5ef7ee1644b099498ddd29c1d051e7ee26ccfd3':
  Default to UTF8 resources when packaging with aapt

Command.cpp

index 970a38152e8df0a39efe806f04111620785bb3c4..51af9650612e79557b61fdcfa518ea1f4e188b9d 100644 (file)
@@ -401,7 +401,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;
             }
 
@@ -428,7 +428,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;
             }