diff options
| author | Elliott Hughes <enh@google.com> | 2015-03-19 18:19:56 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-19 18:19:56 +0000 |
| commit | 41233fcc35ce8c5efa06348f013c31072505229b (patch) | |
| tree | c76032c447a2d8259bf6d974973509ae77e603ea /fastboot | |
| parent | f99e47a0a0604aef2f3b1d07953d5f220662353c (diff) | |
| parent | 294d3f745274330fc86476332f9431285400be2b (diff) | |
| download | system_core-41233fcc35ce8c5efa06348f013c31072505229b.zip system_core-41233fcc35ce8c5efa06348f013c31072505229b.tar.gz system_core-41233fcc35ce8c5efa06348f013c31072505229b.tar.bz2 | |
am 294d3f74: Merge "Remove a prehistoric fastboot hack."
* commit '294d3f745274330fc86476332f9431285400be2b':
Remove a prehistoric fastboot hack.
Diffstat (limited to 'fastboot')
| -rw-r--r-- | fastboot/fastboot.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp index 2c28139..058d62a 100644 --- a/fastboot/fastboot.cpp +++ b/fastboot/fastboot.cpp @@ -711,13 +711,7 @@ void do_update(usb_handle *usb, const char *filename, int erase_first) unsigned sz; void* data = unzip_file(zip, "android-info.txt", &sz); if (data == 0) { - /* fallback for older zipfiles */ - data = unzip_file(zip, "android-product.txt", &sz); - if ((data == 0) || (sz < 1)) { - die("update package has no android-info.txt or android-product.txt"); - } - data = mkmsg("board=%sversion-baseband=0.66.04.19\n", reinterpret_cast<char*>(data)); - sz = strlen(reinterpret_cast<char*>(data)); + die("update package '%s' has no android-info.txt", filename); } setup_requirements(reinterpret_cast<char*>(data), sz); |