Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f9fd0d5a authored by Calin Juravle's avatar Calin Juravle Committed by Gerrit Code Review
Browse files

Merge "Add static versions for libbacktrace and libnativebridge. Bug fixes."

parents 8c047830 28042b56

libbacktrace/Android.build.mk

+1 −1
Original line number Diff line number Diff line
@@ -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

libbacktrace/Android.mk

+8 −0
Original line number Diff line number Diff line
@@ -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.

libnativebridge/Android.mk

+18 −0
Original line number Diff line number Diff line
@@ -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