summaryrefslogtreecommitdiff
path: root/tools/aapt/ResourceTable.cpp
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2012-03-16 19:10:57 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-03-16 19:10:57 -0700
commitbf02b984738f6be5cc2e2d66b12aff7af99eb79e (patch)
tree5935f61cba1cf10d6f1b135c68e37d34424a72ff /tools/aapt/ResourceTable.cpp
parent4eb7fbb250feb34a7fe0df1eb2f4b76945d65c8b (diff)
parent345b7eb8749d6954942fd4e961fff9f2f854934c (diff)
Merge "Remove dead code in StringPool."
Diffstat (limited to 'tools/aapt/ResourceTable.cpp')
-rw-r--r--tools/aapt/ResourceTable.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/aapt/ResourceTable.cpp b/tools/aapt/ResourceTable.cpp
index df6abe85872a..0195727ae7d0 100644
--- a/tools/aapt/ResourceTable.cpp
+++ b/tools/aapt/ResourceTable.cpp
@@ -2598,7 +2598,7 @@ status_t ResourceTable::flatten(Bundle* bundle, const sp<AaptFile>& dest)
// Iterate through all data, collecting all values (strings,
// references, etc).
- StringPool valueStrings = StringPool(false, useUTF8);
+ StringPool valueStrings(useUTF8);
Vector<sp<Entry> > allEntries;
for (pi=0; pi<N; pi++) {
sp<Package> p = mOrderedPackages.itemAt(pi);
@@ -2607,8 +2607,8 @@ status_t ResourceTable::flatten(Bundle* bundle, const sp<AaptFile>& dest)
continue;
}
- StringPool typeStrings = StringPool(false, useUTF8);
- StringPool keyStrings = StringPool(false, useUTF8);
+ StringPool typeStrings(useUTF8);
+ StringPool keyStrings(useUTF8);
const size_t N = p->getOrderedTypes().size();
for (size_t ti=0; ti<N; ti++) {