resolved conflicts for merge of ce307f88 to eclair-mr2

[android/aapt.git] / XMLNode.h

diff --git a/XMLNode.h b/XMLNode.h
index a9bea4312eccd0bd2e30bb0c3c562fb743bb8cb6..dc92fa7c620b3715ed9fc3a5c7b1db0a617a92ba 100644 (file)
--- a/XMLNode.h
+++ b/XMLNode.h
@@ -124,6 +124,8 @@ public:
 
     void removeWhitespace(bool stripAll=true, const char** cDataTags=NULL);
 
+    void setUTF8(bool val) { mUTF8 = val; }
+
     status_t parseValues(const sp<AaptAssets>& assets, ResourceTable* table);
 
     status_t assignResourceIds(const sp<AaptAssets>& assets,
@@ -189,6 +191,9 @@ private:
     String8 mFilename;
     int32_t mStartLineNumber;
     int32_t mEndLineNumber;
+
+    // Encode compiled XML with UTF-8 StringPools?
+    bool mUTF8;
 };
 
 #endif