Merge "Added rules to build f/n/libs/utils in 64-bit: lib64utils.a"

This commit is contained in:
Andrew Hsieh 2012-03-13 15:48:50 -07:00 committed by Android (Google) Code Review
commit 9eeebe3980

View File

@ -43,29 +43,39 @@ commonSources:= \
VectorImpl.cpp \
misc.cpp
# For the host
# =====================================================
include $(CLEAR_VARS)
LOCAL_SRC_FILES:= $(commonSources)
LOCAL_MODULE:= libutils
LOCAL_CFLAGS += -DLIBUTILS_NATIVE=1 $(TOOL_CFLAGS)
host_commonCflags := -DLIBUTILS_NATIVE=1 $(TOOL_CFLAGS)
ifeq ($(HOST_OS),windows)
ifeq ($(strip $(USE_CYGWIN),),)
# Under MinGW, ctype.h doesn't need multi-byte support
LOCAL_CFLAGS += -DMB_CUR_MAX=1
host_commonCflags += -DMB_CUR_MAX=1
endif
endif
host_commonLdlibs :=
ifeq ($(TARGET_OS),linux)
LOCAL_LDLIBS += -lrt -ldl
host_commonLdlibs += -lrt -ldl
endif
# For the host
# =====================================================
include $(CLEAR_VARS)
LOCAL_SRC_FILES:= $(commonSources)
LOCAL_MODULE:= libutils
LOCAL_CFLAGS += $(host_commonCflags)
LOCAL_LDLIBS += $(host_commonLdlibs)
include $(BUILD_HOST_STATIC_LIBRARY)
# For the host, 64-bit
# =====================================================
include $(CLEAR_VARS)
LOCAL_SRC_FILES:= $(commonSources)
LOCAL_MODULE:= lib64utils
LOCAL_CFLAGS += $(host_commonCflags) -m64
LOCAL_LDLIBS += $(host_commonLdlibs)
include $(BUILD_HOST_STATIC_LIBRARY)