openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

am ded3f15e: am 782b98ea: Merge changes I3ca9ed36,Ibd7eec5c 

* commit 'ded3f15eeb5d8a29bd8b5b325bf9d4bc6c4a6ecc':
  Revert "Default to hiding libgcc symbols in each object."
  Revert "Don't apply --exclude-libs for the host."
This commit is contained in:
Dan Albert 2015-09-23 23:53:06 +00:00 committed by Android Git Automerger
parent b49b22d1b3 ded3f15eeb
commit e166febbbc
2 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/binary.mk
View File

@ -412,19 +412,6 @@ ifeq ($(my_allow_undefined_symbols),)
endif endif
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.
ifndef LOCAL_IS_HOST_MODULE
ifneq ($(strip $(LOCAL_NO_EXCLUDE_LIBS)),true)
my_ldflags += -Wl,--exclude-libs,libgcc.a
endif
endif
ifeq (true,$(LOCAL_GROUP_STATIC_LIBRARIES)) ifeq (true,$(LOCAL_GROUP_STATIC_LIBRARIES))
$(LOCAL_BUILT_MODULE): PRIVATE_GROUP_STATIC_LIBRARIES := true $(LOCAL_BUILT_MODULE): PRIVATE_GROUP_STATIC_LIBRARIES := true
else else

1
core/clear_vars.mk
View File

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