am 3347d659: am 1f9e7499: Added rules to build f/b/libs/utils in 64-bit: lib64utils.a (1c4c320d) · Commits · e / os / android_frameworks_base

libs/utils/Android.mk

+25 −14

Original line number	Original line	Diff line number	Diff line
	@@ -51,30 +51,41 @@ commonSources:= \
	ZipUtils.cpp \		ZipUtils.cpp \
	misc.cpp		misc.cpp

			host_commonCflags := -DLIBUTILS_NATIVE=1 $(TOOL_CFLAGS)
	# 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

	ifeq ($(HOST_OS),windows)		ifeq ($(HOST_OS),windows)
	ifeq ($(strip $(USE_CYGWIN),),)		ifeq ($(strip $(USE_CYGWIN),),)
	# Under MinGW, ctype.h doesn't need multi-byte support		# Under MinGW, ctype.h doesn't need multi-byte support
	LOCAL_CFLAGS += -DMB_CUR_MAX=1		host_commonCflags += -DMB_CUR_MAX=1
	endif		endif
	endif		endif

			host_commonLdlibs :=

	ifeq ($(TARGET_OS),linux)		ifeq ($(TARGET_OS),linux)
	LOCAL_LDLIBS += -lrt -ldl		host_commonLdlibs += -lrt -ldl
	endif		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)		include $(BUILD_HOST_STATIC_LIBRARY)