summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Uhler <ruhler@google.com>2015-03-24 14:46:01 -0700
committerRichard Uhler <ruhler@google.com>2015-03-24 14:46:01 -0700
commitacb31ba90509ab1c88a6919ca04aaada5c281236 (patch)
treed33e48dd66d230dd48337821fd92390f00255482
parent8386a726d11785dee69a806a0d37147f7bad1e76 (diff)
downloadsystem_core-acb31ba90509ab1c88a6919ca04aaada5c281236.zip
system_core-acb31ba90509ab1c88a6919ca04aaada5c281236.tar.gz
system_core-acb31ba90509ab1c88a6919ca04aaada5c281236.tar.bz2
Add make target for shared libcutils on host.
Needed by host dex2oat. Change-Id: Ia5b53136de3d531c820f03c3f251e58418204be1
-rw-r--r--libcutils/Android.mk12
1 files changed, 11 insertions, 1 deletions
diff --git a/libcutils/Android.mk b/libcutils/Android.mk
index 2c5e351..d890319 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
# ========================================================