Apply --extra-packages in case --custom-pacakge is also specified.

[android/aapt.git] / XMLNode.cpp

diff --git a/XMLNode.cpp b/XMLNode.cpp
index 8d7acee54461284fba9c829340e8ac1d3740e167..0dba9503f4f0d981cb2f066d197c0ef14130148d 100644 (file)
--- a/XMLNode.cpp
+++ b/XMLNode.cpp
@@ -973,7 +973,7 @@ status_t XMLNode::assignResourceIds(const sp<AaptAssets>& assets,
 status_t XMLNode::flatten(const sp<AaptFile>& dest,
         bool stripComments, bool stripRawValues) const
 {
 status_t XMLNode::flatten(const sp<AaptFile>& dest,
         bool stripComments, bool stripRawValues) const
 {

-    StringPool strings = StringPool(false, mUTF8);
+    StringPool strings(mUTF8);

     Vector<uint32_t> resids;
     
     // First collect just the strings for attribute names that have a
     Vector<uint32_t> resids;
     
     // First collect just the strings for attribute names that have a