summaryrefslogtreecommitdiffstats
path: root/tools/aapt/AaptAssets.h
diff options
context:
space:
mode:
authorRaphael Moll <ralf@android.com>2012-05-18 16:00:04 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-05-18 16:00:04 -0700
commit8748399f6f999d21eef9226baadb20f71dfb61ea (patch)
tree088658b86dfb88761bfb19ddb17a507e03b403da /tools/aapt/AaptAssets.h
parent2a9b85d7ccdd3b8e6be90454cdcb4be3b032cd64 (diff)
parent613945011ef9f79388a1cf21acf514154e2d5af2 (diff)
downloadframeworks_base-8748399f6f999d21eef9226baadb20f71dfb61ea.zip
frameworks_base-8748399f6f999d21eef9226baadb20f71dfb61ea.tar.gz
frameworks_base-8748399f6f999d21eef9226baadb20f71dfb61ea.tar.bz2
am 61394501: Merge "Support a new ANDROID_AAPT_IGNORE env var."
* commit '613945011ef9f79388a1cf21acf514154e2d5af2': 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 d5345b2..52751c7 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;