commit 3613c20c59f931caa7d5411e4350306a4d6ad1e0
author Dimitry Ivanov <dimitry@google.com> Thu Nov 17 05:21:41 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Nov 17 05:21:42 2016 +0000
tree 30086ee5bc34fa5febc723893acc700a19c7a70a
parent 585838ba327bebb94f5a5a37fd9eb371c782fcf5
parent 12b918743d63351b62ca93924e27a4fea0e115df

Merge "Relax ELF header checks - warn for apps targeting pre-O"

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index d5839d3..266ca6e 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -44,8 +44,6 @@
 #include <vector>
 
 // Private C library headers.
-#include "private/KernelArgumentBlock.h"
-#include "private/ScopedPthreadMutexLocker.h"
 #include "private/ScopeGuard.h"
 
 #include "linker.h"
@@ -66,11 +64,6 @@
 #include "android-base/stringprintf.h"
 #include "ziparchive/zip_archive.h"
 
-extern void __libc_init_globals(KernelArgumentBlock&);
-extern void __libc_init_AT_SECURE(KernelArgumentBlock&);
-
-extern "C" void _start();
-
 // Override macros to use C++ style casts.
 #undef ELF_ST_TYPE
 #define ELF_ST_TYPE(x) (static_cast<uint32_t>(x) & 0xf)