From acb31ba90509ab1c88a6919ca04aaada5c281236 Mon Sep 17 00:00:00 2001 From: Richard Uhler Date: Tue, 24 Mar 2015 14:46:01 -0700 Subject: [PATCH] Add make target for shared libcutils on host. Needed by host dex2oat. Change-Id: Ia5b53136de3d531c820f03c3f251e58418204be1 --- libcutils/Android.mk | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) 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 # ========================================================