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

[android/aapt.git] / Main.h

diff --git a/Main.h b/Main.h
index 34ca5e5e4d09d131419b96d9ec6c4aaacd8f3e66..9674c5daa21f866d2108cf6c15e4a25bbe40ce33 100644 (file)
--- a/Main.h
+++ b/Main.h
@@ -33,6 +33,8 @@ extern android::status_t buildResources(Bundle* bundle,
 extern android::status_t writeResourceSymbols(Bundle* bundle,
     const sp<AaptAssets>& assets, const String8& pkgName, bool includePrivate);
 
+extern android::status_t writeProguardFile(Bundle* bundle, const sp<AaptAssets>& assets);
+
 extern bool isValidResourceType(const String8& type);
 
 ssize_t processAssets(Bundle* bundle, ZipFile* zip, const sp<AaptAssets>& assets);
@@ -41,4 +43,9 @@ extern status_t filterResources(Bundle* bundle, const sp<AaptAssets>& assets);
 
 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, bool includeRaw);
 #endif // __MAIN_H