am c496b259: Merge "Default to hiding libgcc symbols in each object."

* commit 'c496b259b8dddf0eac71a50f5e258da4a353d6bb':
  Default to hiding libgcc symbols in each object.

core/binary.mk

@@ -412,6 +412,17 @@ ifeq ($(my_allow_undefined_symbols),)
 endif
 endif
 
+# Target modules shouldn't re-export libgcc.a because we don't want other
+# binaries importing them when they should be getting their own copy of the
+# builtins.
+#
+# Unfortunately --exclude-libs always overrides all other attempts to make a
+# symbol visible, and libc needs to make sure some of these symbols are
+# available for binary compatibility, so libc needs a way to disable this.
+ifneq ($(strip $(LOCAL_NO_EXCLUDE_LIBS)),true)
+  my_ldflags += -Wl,--exclude-libs,libgcc.a
+endif
+
 ifeq (true,$(LOCAL_GROUP_STATIC_LIBRARIES))
 $(LOCAL_BUILT_MODULE): PRIVATE_GROUP_STATIC_LIBRARIES := true
 else

core/clear_vars.mk

@@ -189,6 +189,7 @@ LOCAL_SANITIZE_RECOVER:=
 LOCAL_DBUS_PROXY_PREFIX:=
 LOCAL_INIT_RC:=
 LOCAL_MODULE_HOST_OS:=
+LOCAL_NO_EXCLUDE_LIBS:=
 
 # arch specific variables
 LOCAL_SRC_FILES_$(TARGET_ARCH):=