resolved conflicts for merge of bd6abed3 to gingerbread-plus-aosp

[android/aapt.git] / Main.h

diff --git a/Main.h b/Main.h
index 65c0a8a91dee3f90f8c05de284542c6601a7ae19..3ba4f39062f81aeb71a23d494ce65ad7432baa43 100644 (file)
--- a/Main.h
+++ b/Main.h
@@ -6,10 +6,13 @@
 #ifndef __MAIN_H
 #define __MAIN_H
 
 #ifndef __MAIN_H
 #define __MAIN_H
 

-#include <utils.h>
+#include <utils/Log.h>
+#include <utils/threads.h>
+#include <utils/List.h>
+#include <utils/Errors.h>

 #include "Bundle.h"
 #include "AaptAssets.h"
 #include "Bundle.h"
 #include "AaptAssets.h"

-#include <utils/ZipFile.h>
+#include "ZipFile.h"

 
 extern int doVersion(Bundle* bundle);
 extern int doList(Bundle* bundle);
 
 extern int doVersion(Bundle* bundle);
 extern int doList(Bundle* bundle);


@@ -30,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 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);
 extern bool isValidResourceType(const String8& type);
 
 ssize_t processAssets(Bundle* bundle, ZipFile* zip, const sp<AaptAssets>& assets);


@@ -38,4 +43,7 @@ extern status_t filterResources(Bundle* bundle, const sp<AaptAssets>& assets);
 
 int dumpResources(Bundle* bundle);
 
 
 int dumpResources(Bundle* bundle);
 

+String8 getAttribute(const ResXMLTree& tree, const char* ns,
+                            const char* attr, String8* outError);
+

 #endif // __MAIN_H
 #endif // __MAIN_H