am fe9a2a54: (-s ours) Cherry-pick f51125d from master to ics-mr0. do not merge.

* commit 'fe9a2a5471616a3267b30013bce36b13a455c0cd':
  Cherry-pick f51125d from master to ics-mr0. do not merge.

diff --git a/Android.mk b/Android.mk
index a3e5d9a503b456d39e89275e3f35dcdbd6af376d..cb55a9cfd4d688ff9974460b0e4b61927f12964c 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -44,7 +44,7 @@ LOCAL_STATIC_LIBRARIES := \
        libpng
 
 ifeq ($(HOST_OS),linux)
-LOCAL_LDLIBS += -lrt -lpthread
+LOCAL_LDLIBS += -lrt -ldl -lpthread
 endif
 
 # Statically link libz for MinGW (Win SDK under Linux),

diff --git a/Resource.cpp b/Resource.cpp
index 1ecf7daef123edad3147a9a5f848bffd1915bdc2..887fa7465be932857ea96c3eb4a2b871fcb6f76c 100644 (file)
--- a/Resource.cpp
+++ b/Resource.cpp
@@ -14,14 +14,6 @@
 #include "FileFinder.h"
 #include "CacheUpdater.h"
 
-#if HAVE_PRINTF_ZD
-#  define ZD "%zd"
-#  define ZD_TYPE ssize_t
-#else
-#  define ZD "%ld"
-#  define ZD_TYPE long
-#endif
-
 #define NOISY(x) // x
 
 // ==========================================================================
@@ -574,11 +566,11 @@ static bool applyFileOverlay(Bundle *bundle,
                         DefaultKeyedVector<AaptGroupEntry, sp<AaptFile> > baseFiles =
                                 baseGroup->getFiles();
                         for (size_t i=0; i < baseFiles.size(); i++) {
-                            printf("baseFile " ZD " has flavor %s\n", (ZD_TYPE) i,
+                            printf("baseFile %zd has flavor %s\n", i,
                                     baseFiles.keyAt(i).toString().string());
                         }
                         for (size_t i=0; i < overlayFiles.size(); i++) {
-                            printf("overlayFile " ZD " has flavor %s\n", (ZD_TYPE) i,
+                            printf("overlayFile %zd has flavor %s\n", i,
                                     overlayFiles.keyAt(i).toString().string());
                         }
                     }
@@ -592,8 +584,8 @@ static bool applyFileOverlay(Bundle *bundle,
                                 keyAt(overlayGroupIndex));
                         if (baseFileIndex < UNKNOWN_ERROR) {
                             if (bundle->getVerbose()) {
-                                printf("found a match (" ZD ") for overlay file %s, for flavor %s\n",
-                                        (ZD_TYPE) baseFileIndex,
+                                printf("found a match (%zd) for overlay file %s, for flavor %s\n",
+                                        baseFileIndex,
                                         overlayGroup->getLeaf().string(),
                                         overlayFiles.keyAt(overlayGroupIndex).toString().string());
                             }

diff --git a/StringPool.cpp b/StringPool.cpp
index 9a0a1c46251bf406e5fa598f79f887b0e1271e11..d067d59006c66140f88339f6ea717bf0dcc05f8c 100644 (file)
--- a/StringPool.cpp
+++ b/StringPool.cpp
@@ -8,14 +8,6 @@
 
 #include <utils/ByteOrder.h>
 
-#if HAVE_PRINTF_ZD
-#  define ZD "%zd"
-#  define ZD_TYPE ssize_t
-#else
-#  define ZD "%ld"
-#  define ZD_TYPE long
-#endif
-
 #define NOISY(x) //x
 
 void strcpy16_htod(uint16_t* dst, const uint16_t* src)
@@ -38,7 +30,7 @@ void printStringPool(const ResStringPool* pool)
             str = String8(pool->stringAt(s, &len)).string();
         }
 
-        printf("String #" ZD ": %s\n", (ZD_TYPE) s, str);
+        printf("String #%zd: %s\n", s, str);
     }
 }