summaryrefslogtreecommitdiff
path: root/tools/aapt/Main.h
diff options
context:
space:
mode:
author Jean-Baptiste Queru <jbq@google.com> 2009-11-15 12:06:20 -0800
committer Jean-Baptiste Queru <jbq@google.com> 2009-11-15 12:06:23 -0800
commit478de466ce0504b9af639c3338b883893670a8e8 (patch)
tree61aba455baf06a4821a65b82d1115929619b49bd /tools/aapt/Main.h
parent2b63ff51d5202eb2b458e937d4b65b326238733e (diff)
parent9db3d07b9620b4269ab33f78604a36327e536ce1 (diff)
merge from eclair
Diffstat (limited to 'tools/aapt/Main.h')
-rw-r--r--tools/aapt/Main.h12
1 files changed, 10 insertions, 2 deletions
diff --git a/tools/aapt/Main.h b/tools/aapt/Main.h
index 65c0a8a91dee..3ba4f39062f8 100644
--- a/tools/aapt/Main.h
+++ b/tools/aapt/Main.h
@@ -6,10 +6,13 @@
#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 <utils/ZipFile.h>
+#include "ZipFile.h"
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 writeProguardFile(Bundle* bundle, 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);
+String8 getAttribute(const ResXMLTree& tree, const char* ns,
+ const char* attr, String8* outError);
+
#endif // __MAIN_H