commit 51ee871e19601e1edbac948f961fc557b537870a
author Christopher Ferris <cferris@google.com> Fri May 20 01:27:47 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 20 01:27:47 2016 +0000
tree 5ece79a7ec98cd0dcaea85268984f8759cf2f671
parent 3c095578eefe40a8f8d222520dc85eec1bf752ad
parent 82ef6a19cbaf86f7a1c4a2c13fa3e2dfb882733a

Merge "Updated to v4.4.11 kernel headers."

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index 2b83e00..09286c0 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -405,42 +405,6 @@
           continue;
         }
 
-        ZipArchiveHandle handle = nullptr;
-        void* cookie = nullptr;
-        auto zip_guard = make_scope_guard([&]() {
-          if (cookie != nullptr) {
-            EndIteration(cookie);
-          }
-          if (handle != nullptr) {
-            CloseArchive(handle);
-          }
-        });
-        if (OpenArchive(resolved_path, &handle) != 0) {
-          DL_WARN("Warning: unable to open zip archive: %s", resolved_path);
-          continue;
-        }
-
-        // Check if zip-file has a dir with entry_path name
-        std::string prefix_str = entry_path + "/";
-        ZipString prefix(prefix_str.c_str());
-
-        ZipEntry out_data;
-        ZipString out_name;
-
-        int32_t error_code;
-
-        if ((error_code = StartIteration(handle, &cookie, &prefix, nullptr)) != 0) {
-          DL_WARN("Unable to iterate over zip-archive entries \"%s\";"
-                  " error code: %d", zip_path.c_str(), error_code);
-          continue;
-        }
-
-        if (Next(cookie, &out_data, &out_name) != 0) {
-          DL_WARN("Unable to find entries starting with \"%s\" in \"%s\"",
-                  prefix_str.c_str(), zip_path.c_str());
-          continue;
-        }
-
         resolved_paths->push_back(std::string(resolved_path) + kZipFileSeparator + entry_path);
       }
     }