summaryrefslogtreecommitdiffstats
path: root/tools/aapt/AaptAssets.h
diff options
context:
space:
mode:
authorRaphael Moll <ralf@android.com>2012-05-18 16:33:14 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-05-18 16:33:14 -0700
commitf67f834a9cb7ee9b743e79af85cb42bd45b5aa23 (patch)
tree44605c7c36f04f1c951a07374e32d325a856721a /tools/aapt/AaptAssets.h
parent38e34874a89b6e71464bfa3e89480252000765ad (diff)
parent8748399f6f999d21eef9226baadb20f71dfb61ea (diff)
downloadframeworks_base-f67f834a9cb7ee9b743e79af85cb42bd45b5aa23.zip
frameworks_base-f67f834a9cb7ee9b743e79af85cb42bd45b5aa23.tar.gz
frameworks_base-f67f834a9cb7ee9b743e79af85cb42bd45b5aa23.tar.bz2
am 8748399f: am 61394501: Merge "Support a new ANDROID_AAPT_IGNORE env var."
* commit '8748399f6f999d21eef9226baadb20f71dfb61ea': Support a new ANDROID_AAPT_IGNORE env var.
Diffstat (limited to 'tools/aapt/AaptAssets.h')
-rw-r--r--tools/aapt/AaptAssets.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/aapt/AaptAssets.h b/tools/aapt/AaptAssets.h
index 5924952..d5f296c 100644
--- a/tools/aapt/AaptAssets.h
+++ b/tools/aapt/AaptAssets.h
@@ -22,6 +22,10 @@
using namespace android;
+
+extern const char * const gDefaultIgnoreAssets;
+extern const char * gUserIgnoreAssets;
+
bool valid_symbol_name(const String8& str);
class AaptAssets;