From e29e99c51426ef2c8adf743296ae63d4379aa51d Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Fri, 18 Sep 2015 10:41:54 -0700 Subject: [PATCH] Remove --exclude-libs ldflags. This is now done by default in the build system. The comments say don't do this, but we have linker scripts that protect the few symbols we have to actually keep now. Bug: http://b/24166967 Change-Id: Iff1beeb0f54f80b23fb1561f37a39f208e0bf676 --- libc/Android.mk | 5 ----- libm/Android.mk | 5 ----- 2 files changed, 10 deletions(-) diff --git a/libc/Android.mk b/libc/Android.mk index a8581ac8d..3fac08323 100644 --- a/libc/Android.mk +++ b/libc/Android.mk @@ -1390,11 +1390,6 @@ LOCAL_LDFLAGS_arm64 += -Wl,--version-script,$(LOCAL_PATH)/libc.arm64.map LOCAL_LDFLAGS_mips64 += -Wl,--version-script,$(LOCAL_PATH)/libc.mips64.map LOCAL_LDFLAGS_x86_64 += -Wl,--version-script,$(LOCAL_PATH)/libc.x86_64.map -# 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_64 := -Wl,--exclude-libs,libgcc.a - # Unfortunately --exclude-libs clobbers our version script, so we have to # prevent the build system from using this flag. LOCAL_NO_EXCLUDE_LIBS := true diff --git a/libm/Android.mk b/libm/Android.mk index b07e426d9..0070bd1ee 100644 --- a/libm/Android.mk +++ b/libm/Android.mk @@ -578,10 +578,5 @@ LOCAL_SANITIZE := never LOCAL_CXX_STL := none -# 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_64 := -Wl,--exclude-libs,libgcc.a - include $(BUILD_SHARED_LIBRARY) endif -- 2.11.0