am 5daba1e0: Merge "Only build host library on linux-x86."

* commit '5daba1e0ee1c7cb21b3f8001ab6806834884f0d0':
  Only build host library on linux-x86.
This commit is contained in:
Christopher Ferris 2013-10-02 14:28:35 -07:00 committed by Android Git Automerger
commit 81890fd80f
1 changed files with 32 additions and 32 deletions

View File

@ -62,38 +62,6 @@ LOCAL_SHARED_LIBRARIES := \
include $(BUILD_SHARED_LIBRARY)
#----------------------------------------------------------------------------
# The host libbacktrace library using libcorkscrew
#----------------------------------------------------------------------------
include $(CLEAR_VARS)
LOCAL_SRC_FILES += \
corkscrew.c \
common.c \
demangle.c \
map_info.c \
LOCAL_CFLAGS += \
-Wall \
-Wno-unused-parameter \
-Werror \
-std=gnu99 \
LOCAL_SHARED_LIBRARIES := \
liblog \
libcorkscrew \
libgccdemangle \
liblog \
LOCAL_LDLIBS += \
-ldl \
-lrt \
LOCAL_MODULE := libbacktrace
LOCAL_MODULE_TAGS := optional
include $(BUILD_HOST_SHARED_LIBRARY)
#----------------------------------------------------------------------------
# libbacktrace test library, all optimizations turned off
#----------------------------------------------------------------------------
@ -136,6 +104,38 @@ include $(BUILD_EXECUTABLE)
#----------------------------------------------------------------------------
ifeq ($(HOST_OS)-$(HOST_ARCH),linux-x86)
#----------------------------------------------------------------------------
# The host libbacktrace library using libcorkscrew
#----------------------------------------------------------------------------
include $(CLEAR_VARS)
LOCAL_SRC_FILES += \
corkscrew.c \
common.c \
demangle.c \
map_info.c \
LOCAL_CFLAGS += \
-Wall \
-Wno-unused-parameter \
-Werror \
-std=gnu99 \
LOCAL_SHARED_LIBRARIES := \
liblog \
libcorkscrew \
libgccdemangle \
liblog \
LOCAL_LDLIBS += \
-ldl \
-lrt \
LOCAL_MODULE := libbacktrace
LOCAL_MODULE_TAGS := optional
include $(BUILD_HOST_SHARED_LIBRARY)
#----------------------------------------------------------------------------
# libbacktrace host test library, all optimizations turned off
#----------------------------------------------------------------------------