diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-07-20 16:31:25 -0700 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2011-07-20 16:31:25 -0700 |
| commit | a125c937de06b1cc43368743592f47513eb88b76 (patch) | |
| tree | 514f08565d17813860d4cc240162806f3fda9816 /tools/aapt/Main.h | |
| parent | 57aebc6109f2059ba335a02bf95928a494cff4ba (diff) | |
| parent | 2c311be720341e3249887e592bbc1881008b02bd (diff) | |
| download | frameworks_base-a125c937de06b1cc43368743592f47513eb88b76.zip frameworks_base-a125c937de06b1cc43368743592f47513eb88b76.tar.gz frameworks_base-a125c937de06b1cc43368743592f47513eb88b76.tar.bz2 | |
resolved conflicts for merge of 2c311be7 to honeycomb-plus-aosp
Change-Id: I806c7b4ae95f66df621587e52497dd8739a115fe
Diffstat (limited to 'tools/aapt/Main.h')
| -rw-r--r-- | tools/aapt/Main.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/aapt/Main.h b/tools/aapt/Main.h index 1df1144..9674c5d 100644 --- a/tools/aapt/Main.h +++ b/tools/aapt/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 |