am 294d3f74: Merge "Remove a prehistoric fastboot hack."

* commit '294d3f745274330fc86476332f9431285400be2b':
  Remove a prehistoric fastboot hack.
This commit is contained in:
Elliott Hughes 2015-03-19 18:19:56 +00:00 committed by Android Git Automerger
commit 41233fcc35

View file

@ -711,13 +711,7 @@ void do_update(usb_handle *usb, const char *filename, int erase_first)
unsigned sz; unsigned sz;
void* data = unzip_file(zip, "android-info.txt", &sz); void* data = unzip_file(zip, "android-info.txt", &sz);
if (data == 0) { if (data == 0) {
/* fallback for older zipfiles */ die("update package '%s' has no android-info.txt", filename);
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));
} }
setup_requirements(reinterpret_cast<char*>(data), sz); setup_requirements(reinterpret_cast<char*>(data), sz);