aboutsummaryrefslogtreecommitdiff
path: root/linker/Android.bp
diff options
context:
space:
mode:
authorAndreas Gampe <agampe@google.com>2016-12-06 02:10:13 +0000
committerAndreas Gampe <agampe@google.com>2016-12-06 02:10:13 +0000
commitdcb846cb4978130d5db6b795e22e08b65e73f3cd (patch)
tree08d415c92e8008104cd11fd76574816be320c70e /linker/Android.bp
parentc12acef96bd80c419654e159e1dc24a69513a86d (diff)
downloadbionic-dcb846cb4978130d5db6b795e22e08b65e73f3cd.tar.gz
Revert "Bionic loader is no longer hijacking libdl.so"
This reverts commit c12acef96bd80c419654e159e1dc24a69513a86d. Breaks the Mips build. Bug: 27106625 Change-Id: I27edb7114065c36e1b618e387530d58189cdb184
Diffstat (limited to 'linker/Android.bp')
-rw-r--r--linker/Android.bp5
1 files changed, 5 insertions, 0 deletions
diff --git a/linker/Android.bp b/linker/Android.bp
index a6fd87bfe..5745d7326 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_library_static {
}
cc_binary {
+ clang: true,
defaults: ["linux_bionic_supported"],
+
srcs: [
"dlfcn.cpp",
"linker.cpp",
@@ -96,6 +99,8 @@ cc_binary {
"-Werror",
],
+ conlyflags: ["-std=gnu99"],
+
cppflags: ["-Wold-style-cast"],
// we don't want crtbegin.o (because we have begin.o), so unset it