summaryrefslogtreecommitdiff
path: root/tools/aapt/Main.cpp
diff options
context:
space:
mode:
author Xavier Ducrohet <xav@android.com> 2011-07-19 10:10:17 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2011-07-19 10:10:17 -0700
commit82943ecfe2c4266cf3db50326240825fefcaa38f (patch)
tree4ed53fe7ca63c27c35379236ab80debace4c0108 /tools/aapt/Main.cpp
parent2e659ae59c17a0c0584d35b8c400a294c9d49e12 (diff)
parentd40c93f61ca5b3f2351b8db716f67b58f1625e85 (diff)
am d40c93f6: Merge "Add dependency generation to Aapt for R.java"
* commit 'd40c93f61ca5b3f2351b8db716f67b58f1625e85': Add dependency generation to Aapt for R.java
Diffstat (limited to 'tools/aapt/Main.cpp')
-rw-r--r--tools/aapt/Main.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/aapt/Main.cpp b/tools/aapt/Main.cpp
index 732541d7f4b0..8edb5b53b194 100644
--- a/tools/aapt/Main.cpp
+++ b/tools/aapt/Main.cpp
@@ -146,7 +146,9 @@ void usage(void)
" --custom-package\n"
" generates R.java into a different package.\n"
" --extra-packages\n"
- " generate R.java for libraries. Separate libraries with ';'.\n"
+ " generate R.java for libraries. Separate libraries with ':'.\n"
+ " --generate-dependencies\n"
+ " generate a dependency file for R.java.\n"
" --auto-add-overlay\n"
" Automatically add resources that are only in overlays.\n"
" --rename-manifest-package\n"
@@ -486,6 +488,8 @@ int main(int argc, char* const argv[])
goto bail;
}
bundle.setExtraPackages(argv[0]);
+ } else if (strcmp(cp, "-generate-dependencies") == 0) {
+ bundle.setGenDependencies(true);
} else if (strcmp(cp, "-utf16") == 0) {
bundle.setWantUTF16(true);
} else if (strcmp(cp, "-rename-manifest-package") == 0) {