From 0aa96aedbe8db44148b7e41fd1a58ff8ad00964a Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Tue, 22 Sep 2015 16:30:31 -0700 Subject: [PATCH] Prevent the build system from hiding our ABI. Unfortunately --exclude-libs (now passed globally) clobbers our version script, so we have to prevent the build system from using this flag. Bug: http://b/24166967 Change-Id: I33c766d399c418fdc17983c8c0a56608d463201e --- libc/Android.mk | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/libc/Android.mk b/libc/Android.mk index 175fbb4c0..3435c3f60 100644 --- a/libc/Android.mk +++ b/libc/Android.mk @@ -1387,6 +1387,10 @@ LOCAL_LDFLAGS := -Wl,--version-script,$(LOCAL_PATH)/libc.map # 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 + # TODO: This is to work around b/19059885. Remove after root cause is fixed LOCAL_LDFLAGS_arm := -Wl,--hash-style=both LOCAL_LDFLAGS_x86 := -Wl,--hash-style=both @@ -1455,6 +1459,10 @@ LOCAL_ALLOW_UNDEFINED_SYMBOLS := true # Don't re-export new/delete and friends, even if the compiler really wants to. LOCAL_LDFLAGS := -Wl,--version-script,$(LOCAL_PATH)/version_script.txt +# Unfortunately --exclude-libs clobbers our version script, so we have to +# prevent the build system from using this flag. +LOCAL_NO_EXCLUDE_LIBS := true + # Don't install on release build LOCAL_MODULE_TAGS := eng debug LOCAL_SANITIZE := never @@ -1495,6 +1503,10 @@ LOCAL_SYSTEM_SHARED_LIBRARIES := # Don't re-export new/delete and friends, even if the compiler really wants to. LOCAL_LDFLAGS := -Wl,--version-script,$(LOCAL_PATH)/version_script.txt +# Unfortunately --exclude-libs clobbers our version script, so we have to +# prevent the build system from using this flag. +LOCAL_NO_EXCLUDE_LIBS := true + # Don't install on release build LOCAL_MODULE_TAGS := eng debug LOCAL_SANITIZE := never -- 2.11.0