summaryrefslogtreecommitdiffstats
path: root/libcutils
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2014-07-22 20:53:45 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-07-22 20:53:45 +0000
commitda6d2cb925061818fc1e0e28e2ca3d6ea879fca9 (patch)
tree2cb765ba2c91146356e4f2eab2a7c20939e79f8a /libcutils
parent82ad033562c5224120fb60557c7691a1f26d793d (diff)
parent31dc191b2b39d4cbd68feba29c7692c91de57a53 (diff)
downloadcore-da6d2cb925061818fc1e0e28e2ca3d6ea879fca9.tar.gz
core-da6d2cb925061818fc1e0e28e2ca3d6ea879fca9.tar.bz2
core-da6d2cb925061818fc1e0e28e2ca3d6ea879fca9.zip
am 31dc191b: am 73290cd1: Merge "Remove invalid 64-bit host objects."
* commit '31dc191b2b39d4cbd68feba29c7692c91de57a53': Remove invalid 64-bit host objects.
Diffstat (limited to 'libcutils')
-rw-r--r--libcutils/Android.mk13
1 files changed, 0 insertions, 13 deletions
diff --git a/libcutils/Android.mk b/libcutils/Android.mk
index 933a77bdf..b016a4239 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)