Revert "Revert "Prevent symbols from libgcc from being reexported.""
This reverts commit 4e4e1a5d78ff6dd9394b9b116c012046da409e99. Change-Id: I8e78c3a59598e052e02965dd37b3fba8f567eed9
This commit is contained in:
parent
4e4e1a5d78
commit
71f9b34fbe
@ -971,6 +971,13 @@ LOCAL_SHARED_LIBRARIES := libdl
|
|||||||
LOCAL_WHOLE_STATIC_LIBRARIES := libc_common
|
LOCAL_WHOLE_STATIC_LIBRARIES := libc_common
|
||||||
LOCAL_SYSTEM_SHARED_LIBRARIES :=
|
LOCAL_SYSTEM_SHARED_LIBRARIES :=
|
||||||
|
|
||||||
|
# We'd really like to do this for all architectures, but since this wasn't done
|
||||||
|
# before, these symbols must continue to be exported on LP32 for binary
|
||||||
|
# compatibility.
|
||||||
|
LOCAL_LDFLAGS_arm64 := -Wl,--exclude-libs,libgcc.a
|
||||||
|
LOCAL_LDFLAGS_mips64 := -Wl,--exclude-libs,libgcc.a
|
||||||
|
LOCAL_LDFLAGS_x86_64 := -Wl,--exclude-libs,libgcc.a
|
||||||
|
|
||||||
$(eval $(call patch-up-arch-specific-flags,LOCAL_CFLAGS,libc_common_cflags))
|
$(eval $(call patch-up-arch-specific-flags,LOCAL_CFLAGS,libc_common_cflags))
|
||||||
$(eval $(call patch-up-arch-specific-flags,LOCAL_SRC_FILES,libc_arch_dynamic_src_files))
|
$(eval $(call patch-up-arch-specific-flags,LOCAL_SRC_FILES,libc_arch_dynamic_src_files))
|
||||||
$(eval $(call patch-up-arch-specific-flags,LOCAL_SRC_FILES,libc_static_common_src_files))
|
$(eval $(call patch-up-arch-specific-flags,LOCAL_SRC_FILES,libc_static_common_src_files))
|
||||||
|
@ -291,5 +291,12 @@ LOCAL_MODULE:= libm
|
|||||||
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
|
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
|
||||||
LOCAL_SYSTEM_SHARED_LIBRARIES := libc
|
LOCAL_SYSTEM_SHARED_LIBRARIES := libc
|
||||||
LOCAL_WHOLE_STATIC_LIBRARIES := libm
|
LOCAL_WHOLE_STATIC_LIBRARIES := libm
|
||||||
|
|
||||||
|
# We'd really like to do this for all architectures, but since this wasn't done
|
||||||
|
# before, these symbols must continue to be exported on LP32 for binary
|
||||||
|
# compatibility.
|
||||||
|
LOCAL_LDFLAGS_arm64 := -Wl,--exclude-libs,libgcc.a
|
||||||
|
LOCAL_LDFLAGS_mips64 := -Wl,--exclude-libs,libgcc.a
|
||||||
|
LOCAL_LDFLAGS_x86_64 := -Wl,--exclude-libs,libgcc.a
|
||||||
include $(BUILD_SHARED_LIBRARY)
|
include $(BUILD_SHARED_LIBRARY)
|
||||||
endif
|
endif
|
||||||
|
Loading…
x
Reference in New Issue
Block a user