diff options
| author | Kenny Root <kroot@android.com> | 2011-04-11 15:33:19 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-04-11 15:33:19 -0700 |
| commit | 87b3c0dcc45223ff9d5ab2e39d7b9a6953e03f50 (patch) | |
| tree | 8c64414e6f079c9511163657f200d2ee132309f4 /tools/aapt/Main.cpp | |
| parent | 4430670f48f75661293371dab8db55865f5f56e0 (diff) | |
| parent | 08d9d9a46250c4fad66e9b637e8898a3524c4286 (diff) | |
| download | frameworks_base-87b3c0dcc45223ff9d5ab2e39d7b9a6953e03f50.zip frameworks_base-87b3c0dcc45223ff9d5ab2e39d7b9a6953e03f50.tar.gz frameworks_base-87b3c0dcc45223ff9d5ab2e39d7b9a6953e03f50.tar.bz2 | |
am 08d9d9a4: Merge "Runtime resource overlay, iteration 1."
* commit '08d9d9a46250c4fad66e9b637e8898a3524c4286':
Runtime resource overlay, iteration 1.
Diffstat (limited to 'tools/aapt/Main.cpp')
| -rw-r--r-- | tools/aapt/Main.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/aapt/Main.cpp b/tools/aapt/Main.cpp index 266a02f..1e63131 100644 --- a/tools/aapt/Main.cpp +++ b/tools/aapt/Main.cpp @@ -68,6 +68,7 @@ void usage(void) " [-S resource-sources [-S resource-sources ...]] " " [-F apk-file] [-J R-file-dir] \\\n" " [--product product1,product2,...] \\\n" + " [-o] \\\n" " [raw-files-dir [raw-files-dir] ...]\n" "\n" " Package the android resources. It will read assets and resources that are\n" @@ -105,6 +106,7 @@ 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" + " -o create overlay package (ie only resources; expects <overlay-package> in manifest)\n" #if 0 " -p pseudolocalize the default configuration\n" #endif @@ -275,6 +277,9 @@ int main(int argc, char* const argv[]) case 'm': bundle.setMakePackageDirs(true); break; + case 'o': + bundle.setIsOverlayPackage(true); + break; #if 0 case 'p': bundle.setPseudolocalize(true); |