commit 9e402bb20cb868577e5588d8323363411655291b
author Yabin Cui <yabinc@google.com> Tue Sep 22 04:46:57 2015 +0000
committer Yabin Cui <yabinc@google.com> Tue Sep 22 04:46:57 2015 +0000
tree b21082ce26df5d7115f364ccb57d57f77e6bb4f2
parent 94ece83270deca76c69f5755f8c0ff5c859341fd

Revert "Revert "Revert "Revert "Add BacktraceOffline for offline backtracing.""""

This reverts commit 94ece83270deca76c69f5755f8c0ff5c859341fd.

Change-Id: Ie06465c89a5fc115517130f9f2904cc855973155

libbacktrace/Android.build.mk

diff --git a/libbacktrace/Android.build.mk b/libbacktrace/Android.build.mk
index 4983b55..8e63dab 100644
--- a/libbacktrace/Android.build.mk
+++ b/libbacktrace/Android.build.mk
@@ -69,7 +69,10 @@
     $($(module)_ldlibs) \
     $($(module)_ldlibs_$(build_type)) \
 
+LOCAL_STRIP_MODULE := $($(module)_strip_module)
+
 ifeq ($(build_type),target)
+  include $(LLVM_DEVICE_BUILD_MK)
   include $(BUILD_$(build_target))
 endif
 
@@ -77,6 +80,7 @@
   # Only build if host builds are supported.
   ifeq ($(build_host),true)
     LOCAL_CFLAGS += -Wno-extern-c-compat -fno-omit-frame-pointer
+    include $(LLVM_HOST_BUILD_MK)
     include $(BUILD_HOST_$(build_target))
   endif
 endif