summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 65e80cf)
raw | patch | inline | side by side (parent: 65e80cf)
author | Dan Albert <danalbert@google.com> | |
Mon, 23 Jun 2014 20:12:05 +0000 (20:12 +0000) | ||
committer | Dan Albert <danalbert@google.com> | |
Mon, 23 Jun 2014 20:12:05 +0000 (20:12 +0000) |
This reverts commit 65e80cf62200085f72c1c081aea2d6e9b800cde2.
Change-Id: I5f94b123f73db8d0b03cd71a5cffa0662776a017
Change-Id: I5f94b123f73db8d0b03cd71a5cffa0662776a017
libc/Android.mk | patch | blob | history | |
libm/Android.mk | patch | blob | history |
diff --git a/libc/Android.mk b/libc/Android.mk
index 7febccd8d99149668b0a7397e6f2979d221314a8..1b3965e030cf0e551aa143f9b8f778d8ef0fc716 100644 (file)
--- a/libc/Android.mk
+++ b/libc/Android.mk
LOCAL_WHOLE_STATIC_LIBRARIES := libc_common
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_SRC_FILES,libc_arch_dynamic_src_files))
$(eval $(call patch-up-arch-specific-flags,LOCAL_SRC_FILES,libc_static_common_src_files))
diff --git a/libm/Android.mk b/libm/Android.mk
index 994caa0c6ab1d612550ea23adca47ad8bc16482b..90b4906e1aeec529349f9b0585ac91686a3945d9 100644 (file)
--- a/libm/Android.mk
+++ b/libm/Android.mk
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_SYSTEM_SHARED_LIBRARIES := libc
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)
endif