diff --git a/libbacktrace/Android.build.mk b/libbacktrace/Android.build.mk index 35fed6df5..4983b5530 100644 --- a/libbacktrace/Android.build.mk +++ b/libbacktrace/Android.build.mk @@ -20,7 +20,7 @@ LOCAL_MODULE := $(module) LOCAL_MODULE_TAGS := $(module_tag) LOCAL_MULTILIB := $($(module)_multilib) ifeq ($(LOCAL_MULTILIB),both) -ifneq ($(build_target),$(filter $(build_target),SHARED_LIBRARY STATIC_LIBRRARY)) +ifneq ($(build_target),$(filter $(build_target),SHARED_LIBRARY STATIC_LIBRARY)) LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32 LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64 endif diff --git a/libbacktrace/Android.mk b/libbacktrace/Android.mk index be8b80379..395d67700 100644 --- a/libbacktrace/Android.mk +++ b/libbacktrace/Android.mk @@ -68,6 +68,14 @@ include $(LOCAL_PATH)/Android.build.mk build_type := host libbacktrace_multilib := both include $(LOCAL_PATH)/Android.build.mk +libbacktrace_static_libraries := \ + libbase \ + liblog \ + libunwind \ + +build_target := STATIC_LIBRARY +include $(LOCAL_PATH)/Android.build.mk +libbacktrace_static_libraries := #------------------------------------------------------------------------- # The libbacktrace_test library needed by backtrace_test. diff --git a/libnativebridge/Android.mk b/libnativebridge/Android.mk index 83169ebc6..d20d44cc2 100644 --- a/libnativebridge/Android.mk +++ b/libnativebridge/Android.mk @@ -37,4 +37,22 @@ LOCAL_MULTILIB := both include $(BUILD_HOST_SHARED_LIBRARY) +# Static library for host +# ======================================================== +include $(CLEAR_VARS) + +LOCAL_MODULE:= libnativebridge + +LOCAL_SRC_FILES:= $(NATIVE_BRIDGE_COMMON_SRC_FILES) +LOCAL_STATIC_LIBRARIES := liblog +LOCAL_CLANG := true +LOCAL_CPP_EXTENSION := .cc +LOCAL_CFLAGS += -Werror -Wall +LOCAL_CPPFLAGS := -std=gnu++11 -fvisibility=protected +LOCAL_LDFLAGS := -ldl +LOCAL_MULTILIB := both + +include $(BUILD_HOST_STATIC_LIBRARY) + + include $(LOCAL_PATH)/tests/Android.mk