From 03cc1f747c4e92d572a88ec3eb9fde920e871a7e Mon Sep 17 00:00:00 2001 From: Stephen Hines Date: Mon, 21 Jul 2014 11:27:04 -0700 Subject: Remove invalid 64-bit host objects. Bug: 16408818 These targets are no longer in use, since we have a proper way to create both 32-bit and 64-bit host libraries in a single build now. Change-Id: Icd09f795acd220de5b5e956a8d8e1b4ab4864fa9 --- libcutils/Android.mk | 13 ------------- liblog/Android.mk | 8 -------- libutils/Android.mk | 13 ------------- 3 files changed, 34 deletions(-) diff --git a/libcutils/Android.mk b/libcutils/Android.mk index 933a77b..b016a42 100644 --- a/libcutils/Android.mk +++ b/libcutils/Android.mk @@ -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) diff --git a/liblog/Android.mk b/liblog/Android.mk index a7eead9..a4e5f5e 100644 --- a/liblog/Android.mk +++ b/liblog/Android.mk @@ -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) diff --git a/libutils/Android.mk b/libutils/Android.mk index 9a50147..6164c10 100644 --- a/libutils/Android.mk +++ b/libutils/Android.mk @@ -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) -- cgit v1.1