Merge "When suid_dumpable == 2, set dumpable to 0 for apps"

am: 659a13121c

Change-Id: I02d210fd4d9e13a3f548411cea57a4f2e37c7481

1 files changed, 2 insertions, 9 deletions

diff --git a/tools/aapt/StringPool.cpp b/tools/aapt/StringPool.cpp
index 866291a3b678..37b61bfdffbd 100644
--- a/tools/aapt/StringPool.cpp
+++ b/tools/aapt/StringPool.cpp
@@ -12,13 +12,6 @@
 
 #include "ResourceTable.h"
 
-// SSIZE: mingw does not have signed size_t == ssize_t.
-#if !defined(_WIN32)
-#  define SSIZE(x) x
-#else
-#  define SSIZE(x) (signed size_t)x
-#endif
-
 // Set to true for noisy debug output.
 static const bool kIsDebug = false;
 
@@ -202,7 +195,7 @@ ssize_t StringPool::add(const String16& value,
 
     if (kIsDebug) {
         printf("Adding string %s to pool: pos=%zd eidx=%zd vidx=%zd\n",
-                String8(value).string(), SSIZE(pos), SSIZE(eidx), SSIZE(vidx));
+                String8(value).string(), pos, eidx, vidx);
     }
 
     return pos;
@@ -598,7 +591,7 @@ ssize_t StringPool::offsetForString(const String16& val) const
     const Vector<size_t>* indices = offsetsForString(val);
     ssize_t res = indices != NULL && indices->size() > 0 ? indices->itemAt(0) : -1;
     if (kIsDebug) {
-        printf("Offset for string %s: %zd (%s)\n", String8(val).string(), SSIZE(res),
+        printf("Offset for string %s: %zd (%s)\n", String8(val).string(), res,
                 res >= 0 ? String8(mEntries[mEntryArray[res]].value).string() : String8());
     }
     return res;