commit d510f2273209fec81f7b5d457e72cd75a5bc34dd
author Victor Khimenko <khim@google.com> Mon Sep 28 20:46:38 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Sep 28 20:46:38 2020 +0000
tree aab6cc14bb3939beb4b884816d3775a8da057324
parent 5aedb684997d8d7c43e6cfd2edad1c21716ea91e
parent b967e793a5b2e7f1742121797d35326400f41852

Merge "Stop marking symbols weak in native bionic build"

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_ */