commit 4e468ed2eb86a2406e14f1eca82072ee501d05fd
author The Android Open Source Project <initial-contribution@android.com> Wed Dec 17 18:03:48 2008 -0800
committer The Android Open Source Project <initial-contribution@android.com> Wed Dec 17 18:03:48 2008 -0800
tree 4e05b3c66eef86531e464521a3bf96a1864d4bf5
parent a27d2baa0c1a2ec70f47ea9199b1dd6762c8a349

Code drop from //branches/cupcake/...@124589

libdl/Android.mk

diff --git a/libdl/Android.mk b/libdl/Android.mk
index 661aa18..150f704 100644
--- a/libdl/Android.mk
+++ b/libdl/Android.mk
@@ -16,6 +16,14 @@
 # DO NOT REMOVE --exclude-libs!
 
 LOCAL_LDFLAGS := -Wl,--exclude-libs=libgcc.a
+
+# for x86, exclude libgcc_eh.a for the same reasons as above
+ifneq ($(TARGET_SIMULATOR),true)
+ifeq ($(TARGET_ARCH),x86)
+LOCAL_LDFLAGS += -Wl,--exclude-libs=libgcc_eh.a
+endif
+endif
+
 LOCAL_SRC_FILES:= libdl.c
 
 LOCAL_MODULE:= libdl