am 1c4c320d: am 3347d659: am 1f9e7499: Added rules to build f/b/libs/utils in 64-bit: lib64utils.a

* commit '1c4c320da7832129621e9e44d3f8d8902cb58462':
  Added rules to build f/b/libs/utils in 64-bit: lib64utils.a
This commit is contained in:
Andrew Hsieh
2012-03-22 10:22:24 -07:00
committed by Android Git Automerger

View File

@ -51,30 +51,41 @@ commonSources:= \
ZipUtils.cpp \
misc.cpp
# For the host
# =====================================================
include $(CLEAR_VARS)
LOCAL_SRC_FILES:= $(commonSources)
LOCAL_MODULE:= libutils
LOCAL_CFLAGS += -DLIBUTILS_NATIVE=1 $(TOOL_CFLAGS)
LOCAL_C_INCLUDES += external/zlib
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)
LOCAL_C_INCLUDES += external/zlib
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)
LOCAL_C_INCLUDES += external/zlib
include $(BUILD_HOST_STATIC_LIBRARY)