commit dcb846cb4978130d5db6b795e22e08b65e73f3cd
author Andreas Gampe <agampe@google.com> Tue Dec 06 02:10:13 2016 +0000
committer Andreas Gampe <agampe@google.com> Tue Dec 06 02:10:13 2016 +0000
tree 08d415c92e8008104cd11fd76574816be320c70e
parent c12acef96bd80c419654e159e1dc24a69513a86d

Revert "Bionic loader is no longer hijacking libdl.so"

This reverts commit c12acef96bd80c419654e159e1dc24a69513a86d.

Breaks the Mips build.

Bug: 27106625
Change-Id: I27edb7114065c36e1b618e387530d58189cdb184

linker/Android.bp

diff --git a/linker/Android.bp b/linker/Android.bp
index a6fd87b..5745d73 100644
--- a/linker/Android.bp
+++ b/linker/Android.bp
@@ -1,5 +1,6 @@
 cc_library_static {
     name: "liblinker_malloc",
+    clang: true,
     defaults: ["linux_bionic_supported"],
 
     srcs: [
@@ -12,7 +13,9 @@
 }
 
 cc_binary {
+    clang: true,
     defaults: ["linux_bionic_supported"],
+
     srcs: [
         "dlfcn.cpp",
         "linker.cpp",
@@ -96,6 +99,8 @@
         "-Werror",
     ],
 
+    conlyflags: ["-std=gnu99"],
+
     cppflags: ["-Wold-style-cast"],
 
     // we don't want crtbegin.o (because we have begin.o), so unset it