diff options
| author | Kenny Root <kroot@google.com> | 2010-10-01 17:07:21 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-01 17:07:21 -0700 |
| commit | edeb7a5a391ddec6df6d34ecb1f64ef2bb376dbb (patch) | |
| tree | d57d8976a2fb625ff8f5f65e8619759a854646b2 /tools | |
| parent | 120e6be701833fd7cdc6bf063b17e1f88929a074 (diff) | |
| parent | 7e40e67f73e0e9fa61a9601d82e8a207ffdca039 (diff) | |
| download | frameworks_base-edeb7a5a391ddec6df6d34ecb1f64ef2bb376dbb.zip frameworks_base-edeb7a5a391ddec6df6d34ecb1f64ef2bb376dbb.tar.gz frameworks_base-edeb7a5a391ddec6df6d34ecb1f64ef2bb376dbb.tar.bz2 | |
am 7e40e67f: am d9e88d22: Merge "Add "none" for vold and deprecate mkobb -c" into gingerbread
Merge commit '7e40e67f73e0e9fa61a9601d82e8a207ffdca039'
* commit '7e40e67f73e0e9fa61a9601d82e8a207ffdca039':
Add "none" for vold and deprecate mkobb -c
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/obbtool/mkobb.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/obbtool/mkobb.sh b/tools/obbtool/mkobb.sh index 1987696..ba5256f 100755 --- a/tools/obbtool/mkobb.sh +++ b/tools/obbtool/mkobb.sh @@ -161,11 +161,10 @@ eval set -- "$args" while true; do \ case "$1" in - -c) use_crypto=1; shift;; -d) directory=$2; shift 2;; -h) usage; exit 1;; - -k) key=$2; shift 2;; - -K) prompt_key=1; shift;; + -k) key=$2; use_crypto=1; shift 2;; + -K) prompt_key=1; use_crypto=1; shift;; -v) verbose=1; shift;; -o) filename=$2; shift 2;; --) shift; break;; |