From b9d2dc2319d1ced5cabedabe0dfbf5add9753dbd Mon Sep 17 00:00:00 2001 From: Xavier Ducrohet Date: Thu, 4 Feb 2010 18:45:31 -0800 Subject: Add --auto-add-overlay option to aapt. DO NOT MERGE This option allows resources only present in overlays to be added automatically instead of being declared through (merge from master) Change-Id: I5f402a1fa7213d18724d91f84bc05ef39ace2ed9 --- tools/aapt/Main.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'tools/aapt/Main.cpp') diff --git a/tools/aapt/Main.cpp b/tools/aapt/Main.cpp index 0b51ad8eb9c8..1a4ec7a47291 100644 --- a/tools/aapt/Main.cpp +++ b/tools/aapt/Main.cpp @@ -60,6 +60,7 @@ void usage(void) " [--min-sdk-version VAL] [--target-sdk-version VAL] \\\n" " [--max-sdk-version VAL] [--app-version VAL] \\\n" " [--app-version-name TEXT] [--custom-package VAL] \\\n" + " [--auto-add-overlay] \\\n" " [-I base-package [-I base-package ...]] \\\n" " [-A asset-source-dir] [-G class-list-file] [-P public-definitions-file] \\\n" " [-S resource-sources [-S resource-sources ...]] " @@ -134,7 +135,9 @@ void usage(void) " --version-name\n" " inserts android:versionName in to manifest.\n" " --custom-package\n" - " generates R.java into a different package.\n"); + " generates R.java into a different package.\n" + " --auto-add-overlay\n" + " Automatically add resources that are only in overlays.\n"); } /* @@ -429,6 +432,8 @@ int main(int argc, char* const argv[]) goto bail; } bundle.setCustomPackage(argv[0]); + } else if (strcmp(cp, "-auto-add-overlay") == 0) { + bundle.setAutoAddOverlay(true); } else { fprintf(stderr, "ERROR: Unknown option '-%s'\n", cp); wantUsage = true; -- cgit v1.2.3-59-g8ed1b