commit 913ae7339568554b6d88061940036a09acc6fbed
author Elliott Hughes <enh@google.com> Thu Jul 06 21:15:35 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jul 06 21:15:35 2017 +0000
tree eabc08e9c05a13bdd9696f8e49921368488ea79e
parent 9d2d21d6367442c93c6375e621ac1eca29019e3d
parent 0af3e8febd747827d959aa95501a8db4dbdb9db4

Merge "Fix <dirent.h> d_ino/d_off types."

linker/linker_main.cpp

diff --git a/linker/linker_main.cpp b/linker/linker_main.cpp
index db36976..3f7795b 100644
--- a/linker/linker_main.cpp
+++ b/linker/linker_main.cpp
@@ -138,8 +138,7 @@
 // An empty list of soinfos
 static soinfo_list_t g_empty_list;
 
-static void add_vdso(KernelArgumentBlock& args __unused) {
-#if defined(AT_SYSINFO_EHDR)
+static void add_vdso(KernelArgumentBlock& args) {
   ElfW(Ehdr)* ehdr_vdso = reinterpret_cast<ElfW(Ehdr)*>(args.getauxval(AT_SYSINFO_EHDR));
   if (ehdr_vdso == nullptr) {
     return;
@@ -155,7 +154,6 @@
 
   si->prelink_image();
   si->link_image(g_empty_list, soinfo_list_t::make_list(si), nullptr);
-#endif
 }
 
 /* gdb expects the linker to be in the debug shared object list.

tests/Android.bp

diff --git a/tests/Android.bp b/tests/Android.bp
index 2a5b47e..efb86b8 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -288,6 +288,7 @@
             ],
             static_libs: [
                 "libpagemap",
+                "libziparchive",
                 "libLLVMObject",
                 "libLLVMBitReader",
                 "libLLVMMC",