commit 1682c63d777d7b008415c2166dd896444e3f1596
author Ying Wang <wangying@google.com> Thu Jan 23 15:15:28 2014 -0800
committer Ying Wang <wangying@google.com> Fri Jan 24 16:50:16 2014 -0800
tree 94398681f6fb6196cc4e71ce8d56044c5439329d
parent 5acce960f40f51107301398f9cadff680a634951

Use arch-specific variable to set up the x86 ld flags.

Bug: 11654773
Change-Id: I9e9075bac1303cfa39b0f717dd74625ce1dd5fa5

libdl/Android.mk

diff --git a/libdl/Android.mk b/libdl/Android.mk
index 49cfb0c..3d60474 100644
--- a/libdl/Android.mk
+++ b/libdl/Android.mk
@@ -18,9 +18,8 @@
 LOCAL_LDFLAGS := -Wl,--exclude-libs=libgcc.a
 
 # for x86, exclude libgcc_eh.a for the same reasons as above
-ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),x86 x86_64))
-LOCAL_LDFLAGS += -Wl,--exclude-libs=libgcc_eh.a
-endif
+LOCAL_LDFLAGS_x86 := -Wl,--exclude-libs=libgcc_eh.a
+LOCAL_LDFLAGS_x86_64 := $(LOCAL_LDFLAGS_x86)
 
 LOCAL_SRC_FILES:= libdl.c
 LOCAL_CFLAGS := -Wall -Wextra -Werror