resolved conflicts for merge of 2c311be7 to honeycomb-plus-aosp

[android/aapt.git] / Main.cpp

diff --git a/Main.cpp b/Main.cpp
index 732541d7f4b0ac52ce54f5d8019d8911f350c722..9887268abd7e51662aed3b0934e207303cd39001 100644 (file)
--- a/Main.cpp
+++ b/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 dependency files in the same directories for R.java and resource package\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) {