commit 18a38b4784a97ac0c58038ff1b57c7cbcc3106c7
author Elliott Hughes <enh@google.com> Thu Mar 19 18:08:12 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 19 18:08:12 2015 +0000
tree c76032c447a2d8259bf6d974973509ae77e603ea
parent 589189fe20b64a479e0714fc7dc8e181d173438e
parent ed69f386f6408a4bd5ec3be1ee85e28911889f6b

Merge "Remove a prehistoric fastboot hack."

fastboot/fastboot.cpp

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 @@
     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);