am a0115bf7: Merge "Add make target for shared libcutils on host."

* commit 'a0115bf78db6ef373754fade0fe4028ac8c88653':
  Add make target for shared libcutils on host.
This commit is contained in:
Richard Uhler 2015-03-25 15:53:35 +00:00 committed by Android Git Automerger
commit f30beae169

View file

@ -64,7 +64,7 @@ ifneq ($(WINDOWS_HOST_ONLY),1)
endif endif
# Static library for host # Shared and static library for host
# ======================================================== # ========================================================
LOCAL_MODULE := libcutils LOCAL_MODULE := libcutils
LOCAL_SRC_FILES := $(commonSources) $(commonHostSources) dlmalloc_stubs.c LOCAL_SRC_FILES := $(commonSources) $(commonHostSources) dlmalloc_stubs.c
@ -76,6 +76,16 @@ LOCAL_MULTILIB := both
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
include $(BUILD_HOST_STATIC_LIBRARY) 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 # Tests for host
# ======================================================== # ========================================================