Merge "Remove invalid 64-bit host objects." (73290cd1) · Commits · e / os / android_system_core

libcutils/Android.mk

+0 −13

Original line number	Diff line number	Diff line
		@@ -86,19 +86,6 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
		include $(BUILD_HOST_STATIC_LIBRARY)


		# Static library for host, 64-bit
		# ========================================================
		include $(CLEAR_VARS)
		LOCAL_MODULE := lib64cutils
		LOCAL_SRC_FILES := $(commonSources) $(commonHostSources) dlmalloc_stubs.c
		LOCAL_STATIC_LIBRARIES := lib64log
		LOCAL_CFLAGS += $(hostSmpFlag) -m64
		ifneq ($(HOST_OS),windows)
		LOCAL_CFLAGS += -Werror
		endif
		LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
		include $(BUILD_HOST_STATIC_LIBRARY)

		# Tests for host
		# ========================================================
		include $(CLEAR_VARS)

+0 −8

Original line number	Diff line number	Diff line
		@@ -71,14 +71,6 @@ LOCAL_MULTILIB := both
		include $(BUILD_HOST_SHARED_LIBRARY)


		# Static library for host, 64-bit
		# ========================================================
		include $(CLEAR_VARS)
		LOCAL_MODULE := lib64log
		LOCAL_SRC_FILES := $(liblog_host_sources)
		LOCAL_CFLAGS := -DFAKE_LOG_DEVICE=1 -m64 -Werror
		include $(BUILD_HOST_STATIC_LIBRARY)

		# Shared and static library for target
		# ========================================================
		include $(CLEAR_VARS)

+0 −13

Original line number	Diff line number	Diff line
		@@ -73,19 +73,6 @@ LOCAL_MULTILIB := both
		include $(BUILD_HOST_STATIC_LIBRARY)


		# For the host, 64-bit
		# =====================================================
		include $(CLEAR_VARS)
		LOCAL_SRC_FILES:= $(commonSources)
		ifeq ($(HOST_OS), linux)
		LOCAL_SRC_FILES += Looper.cpp
		endif
		LOCAL_MODULE:= lib64utils
		LOCAL_STATIC_LIBRARIES := liblog
		LOCAL_CFLAGS += $(host_commonCflags) -m64
		include $(BUILD_HOST_STATIC_LIBRARY)


		# For the device, static
		# =====================================================
		include $(CLEAR_VARS)