frameworks/base refactoring

[android/aapt.git] / Images.cpp

diff --git a/Images.cpp b/Images.cpp
index 311ceea660c53fd1ca8fa7df8fe4a299c294e9aa..6402e3cb38d8ca6e0b3612a4e2efb9e244e2a581 100644 (file)
--- a/Images.cpp
+++ b/Images.cpp
@@ -8,7 +8,7 @@
 
 #include "Images.h"
 
 
 #include "Images.h"
 

-#include <utils/ResourceTypes.h>
+#include <androidfw/ResourceTypes.h>

 #include <utils/ByteOrder.h>
 
 #include <png.h>
 #include <utils/ByteOrder.h>
 
 #include <png.h>


@@ -980,6 +980,10 @@ status_t preProcessImage(Bundle* bundle, const sp<AaptAssets>& assets,
 
     String8 printableName(file->getPrintableSource());
 
 
     String8 printableName(file->getPrintableSource());
 

+    if (bundle->getVerbose()) {
+        printf("Processing image: %s\n", printableName.string());
+    }
+

     png_structp read_ptr = NULL;
     png_infop read_info = NULL;
     FILE* fp;
     png_structp read_ptr = NULL;
     png_infop read_info = NULL;
     FILE* fp;


@@ -1094,6 +1098,10 @@ status_t preProcessImageToCache(Bundle* bundle, String8 source, String8 dest)
 
     status_t error = UNKNOWN_ERROR;
 
 
     status_t error = UNKNOWN_ERROR;
 

+    if (bundle->getVerbose()) {
+        printf("Processing image to cache: %s => %s\n", source.string(), dest.string());
+    }
+

     // Get a file handler to read from
     fp = fopen(source.string(),"rb");
     if (fp == NULL) {
     // Get a file handler to read from
     fp = fopen(source.string(),"rb");
     if (fp == NULL) {