summaryrefslogtreecommitdiffstats
path: root/libcutils
diff options
context:
space:
mode:
authorRichard Uhler <ruhler@google.com>2015-03-25 15:48:42 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-03-25 15:48:42 +0000
commita0115bf78db6ef373754fade0fe4028ac8c88653 (patch)
tree436d496a2d724142f79885c910ae77a030d597a0 /libcutils
parent8257211f9e696ebf7ca13f513f7e44431616313c (diff)
parentacb31ba90509ab1c88a6919ca04aaada5c281236 (diff)
downloadsystem_core-a0115bf78db6ef373754fade0fe4028ac8c88653.tar.gz
system_core-a0115bf78db6ef373754fade0fe4028ac8c88653.tar.bz2
system_core-a0115bf78db6ef373754fade0fe4028ac8c88653.zip
Merge "Add make target for shared libcutils on host."
Diffstat (limited to 'libcutils')
-rw-r--r--libcutils/Android.mk12
1 files changed, 11 insertions, 1 deletions
diff --git a/libcutils/Android.mk b/libcutils/Android.mk
index 2c5e351a2..d8903192a 100644
--- a/libcutils/Android.mk
+++ b/libcutils/Android.mk
@@ -64,7 +64,7 @@ ifneq ($(WINDOWS_HOST_ONLY),1)
endif
-# Static library for host
+# Shared and static library for host
# ========================================================
LOCAL_MODULE := libcutils
LOCAL_SRC_FILES := $(commonSources) $(commonHostSources) dlmalloc_stubs.c
@@ -76,6 +76,16 @@ LOCAL_MULTILIB := both
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
include $(BUILD_HOST_STATIC_LIBRARY)
+include $(CLEAR_VARS)
+LOCAL_MODULE := libcutils
+LOCAL_SRC_FILES := $(commonSources) $(commonHostSources) dlmalloc_stubs.c
+LOCAL_SHARED_LIBRARIES := liblog
+ifneq ($(HOST_OS),windows)
+LOCAL_CFLAGS += -Werror
+endif
+LOCAL_MULTILIB := both
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
+include $(BUILD_HOST_SHARED_LIBRARY)
# Tests for host
# ========================================================