From 7c6d884e2b4d48716f6d9403234403b8c101fb58 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Thu, 19 Mar 2015 10:30:53 -0700 Subject: [PATCH] Remove a prehistoric fastboot hack. If you don't have android-info.txt in your zip file, you're probably not using a current fastboot binary anyway. Change-Id: Ic721dc5f068f704c6792493d1e99f05f907678ba --- fastboot/fastboot.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp index 2c2813919..058d62a92 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(data)); - sz = strlen(reinterpret_cast(data)); + die("update package '%s' has no android-info.txt", filename); } setup_requirements(reinterpret_cast(data), sz);