diff options
author | Stephen Hines <srhines@google.com> | 2014-07-22 20:44:56 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-07-22 16:35:00 +0000 |
commit | 73290cd1369422260f1843dc36949c27422c0300 (patch) | |
tree | 59b641dde4ae1320f72f0ef6ed6441fb3ce7ce83 | |
parent | 2fd1fec6197e0ede7a404e106e3dc6ce226dca58 (diff) | |
parent | 03cc1f747c4e92d572a88ec3eb9fde920e871a7e (diff) | |
download | system_core-73290cd1369422260f1843dc36949c27422c0300.zip system_core-73290cd1369422260f1843dc36949c27422c0300.tar.gz system_core-73290cd1369422260f1843dc36949c27422c0300.tar.bz2 |
Merge "Remove invalid 64-bit host objects."
-rw-r--r-- | libcutils/Android.mk | 13 | ||||
-rw-r--r-- | liblog/Android.mk | 8 | ||||
-rw-r--r-- | libutils/Android.mk | 13 |
3 files changed, 0 insertions, 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) |