Merge "Fix "Too many open files" error for aapt built with Mac OS X SDK 10.6."

[android/aapt.git] / Main.cpp

diff --git a/Main.cpp b/Main.cpp
index 9f05c6a6a38e065043f138b7820d8829feea07a3..9570c663cbea63a289cf7f629fced31a74c14add 100644 (file)
--- a/Main.cpp
+++ b/Main.cpp
@@ -69,7 +69,6 @@ void usage(void)
         "        [-F apk-file] [-J R-file-dir] \\\n"
         "        [--product product1,product2,...] \\\n"
         "        [-c CONFIGS] [--preferred-configurations CONFIGS] \\\n"
         "        [-F apk-file] [-J R-file-dir] \\\n"
         "        [--product product1,product2,...] \\\n"
         "        [-c CONFIGS] [--preferred-configurations CONFIGS] \\\n"

-        "        [-o] \\\n"

         "        [raw-files-dir [raw-files-dir] ...]\n"
         "\n"
         "   Package the android resources.  It will read assets and resources that are\n"
         "        [raw-files-dir [raw-files-dir] ...]\n"
         "\n"
         "   Package the android resources.  It will read assets and resources that are\n"


@@ -110,7 +109,6 @@ void usage(void)
         "   -j  specify a jar or zip file containing classes to include\n"
         "   -k  junk path of file(s) added\n"
         "   -m  make package directories under location specified by -J\n"
         "   -j  specify a jar or zip file containing classes to include\n"
         "   -k  junk path of file(s) added\n"
         "   -m  make package directories under location specified by -J\n"

-        "   -o  create overlay package (ie only resources; expects <overlay-package> in manifest)\n"

 #if 0
         "   -p  pseudolocalize the default configuration\n"
 #endif
 #if 0
         "   -p  pseudolocalize the default configuration\n"
 #endif


@@ -296,9 +294,6 @@ int main(int argc, char* const argv[])
             case 'm':
                 bundle.setMakePackageDirs(true);
                 break;
             case 'm':
                 bundle.setMakePackageDirs(true);
                 break;

-            case 'o':
-                bundle.setIsOverlayPackage(true);
-                break;

 #if 0
             case 'p':
                 bundle.setPseudolocalize(true);
 #if 0
             case 'p':
                 bundle.setPseudolocalize(true);