am b32cc032: Merge "Use arch-specific variable to set up the x86 ld flags."

* commit 'b32cc032030e7a9f50b28d6dba5a40a38e6e76cf':
  Use arch-specific variable to set up the x86 ld flags.
This commit is contained in:
Ying Wang 2014-01-24 16:55:33 -08:00 committed by Android Git Automerger
commit 2275047684

View File

@ -18,9 +18,8 @@ include $(CLEAR_VARS)
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