resolved conflicts for merge of 2c311be7 to honeycomb-plus-aosp

[android/aapt.git] / Main.h

diff --git a/Main.h b/Main.h
index 1df114430fd3869ff8b1f1d3f20bf01825786860..9674c5daa21f866d2108cf6c15e4a25bbe40ce33 100644 (file)
--- a/Main.h
+++ b/Main.h
@@ -46,5 +46,6 @@ int dumpResources(Bundle* bundle);
 String8 getAttribute(const ResXMLTree& tree, const char* ns,
                             const char* attr, String8* outError);
 
-status_t writeDependencyPreReqs(Bundle* bundle, const sp<AaptAssets>& assets, FILE* fp);
+status_t writeDependencyPreReqs(Bundle* bundle, const sp<AaptAssets>& assets,
+                                FILE* fp, bool includeRaw);
 #endif // __MAIN_H