commit 00b314436f4fdfada4bbf1e79ec12e9fa38aeaf1
author Narayan Kamath <narayan@google.com> Mon Jan 27 17:32:37 2014 +0000
committer Narayan Kamath <narayan@google.com> Tue Jan 28 16:27:52 2014 +0000
tree d1d6075692ef537e80d05255a13204a61f0f8a04
parent 729b12c7a91f9caa65af77197cf6a8814a5a2051

Change ResourceType cookies to int32_t.

Also change the order of parameters in ResTable constructors
to avoid ambiguity.

Change-Id: If7bfa1f640dddca39b9f26a3ce84081fa7b6e6e3

tools/aapt/AaptAssets.cpp

diff --git a/tools/aapt/AaptAssets.cpp b/tools/aapt/AaptAssets.cpp
index f11e9c2..e412c27 100644
--- a/tools/aapt/AaptAssets.cpp
+++ b/tools/aapt/AaptAssets.cpp
@@ -2654,7 +2654,7 @@
 {
     const ResTable& res = getIncludedResources();
     // XXX dirty!
-    return const_cast<ResTable&>(res).add(file->getData(), file->getSize(), NULL);
+    return const_cast<ResTable&>(res).add(file->getData(), file->getSize());
 }
 
 const ResTable& AaptAssets::getIncludedResources() const

tools/aapt/Resource.cpp

diff --git a/tools/aapt/Resource.cpp b/tools/aapt/Resource.cpp
index 8f43661..a390e42 100644
--- a/tools/aapt/Resource.cpp
+++ b/tools/aapt/Resource.cpp
@@ -1320,7 +1320,7 @@
         }
         
         // Read resources back in,
-        finalResTable.add(resFile->getData(), resFile->getSize(), NULL);
+        finalResTable.add(resFile->getData(), resFile->getSize());
         
 #if 0
         NOISY(