From 00b314436f4fdfada4bbf1e79ec12e9fa38aeaf1 Mon Sep 17 00:00:00 2001
From: Narayan Kamath <narayan@google.com>
Date: Mon, 27 Jan 2014 17:32:37 +0000
Subject: Change ResourceType cookies to int32_t.

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

Change-Id: If7bfa1f640dddca39b9f26a3ce84081fa7b6e6e3
---
 tools/aapt/Resource.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools/aapt/Resource.cpp')

diff --git a/tools/aapt/Resource.cpp b/tools/aapt/Resource.cpp
index 8f43661ceef8..a390e42b46e4 100644
--- a/tools/aapt/Resource.cpp
+++ b/tools/aapt/Resource.cpp
@@ -1320,7 +1320,7 @@ status_t buildResources(Bundle* bundle, const sp<AaptAssets>& assets)
         }
         
         // Read resources back in,
-        finalResTable.add(resFile->getData(), resFile->getSize(), NULL);
+        finalResTable.add(resFile->getData(), resFile->getSize());
         
 #if 0
         NOISY(
-- 
cgit v1.2.3-59-g8ed1b