commit b967e793a5b2e7f1742121797d35326400f41852
author Victor Khimenko <khim@google.com> Mon Sep 28 20:24:03 2020 +0200
committer Victor Khimenko <khim@google.com> Mon Sep 28 20:25:32 2020 +0200
tree b4b4cd1ff10d3e9ca3683caf87b383792747b7aa
parent 73ed0c4525121d5ba7c0326f348e780935e6f7cc

Stop marking symbols weak in native bionic build

Now, when we can detect native bridge mode is sources we can do that.

Test: m (without weak symbols in native bridge mode x86+arm build would be broken)

Change-Id: I360e7df8211d03636bbe716dc14655ee8d765493

libc/private/bionic_defs.h

diff --git a/libc/private/bionic_defs.h b/libc/private/bionic_defs.h
index 1d4f86b..c0ae1b0 100644
--- a/libc/private/bionic_defs.h
+++ b/libc/private/bionic_defs.h
@@ -33,7 +33,12 @@
  * This label is used to mark libc/libdl symbols that may need to be replaced
  * by native bridge implementation.
  */
+#ifdef __ANDROID_NATIVE_BRIDGE__
 #define __BIONIC_WEAK_FOR_NATIVE_BRIDGE __attribute__((__weak__, __noinline__))
 #define __BIONIC_WEAK_VARIABLE_FOR_NATIVE_BRIDGE __attribute__((__weak__))
+#else
+#define __BIONIC_WEAK_FOR_NATIVE_BRIDGE
+#define __BIONIC_WEAK_VARIABLE_FOR_NATIVE_BRIDGE
+#endif
 
 #endif /* __BIONIC_PRIVATE_BIONIC_DEFS_H_ */