diff options
| author | Dan Albert <danalbert@google.com> | 2014-05-19 10:10:37 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-05-19 10:23:16 -0700 |
| commit | 40a46dde9ceb8c5e314665d44fbd7c3537a82707 (patch) | |
| tree | 44991e38b41fb563dab179185e6d4180e318c97c | |
| parent | 0296be9d98fa429a17c90d4ec4d0becb18b9f8ec (diff) | |
| download | system_core-40a46dde9ceb8c5e314665d44fbd7c3537a82707.zip system_core-40a46dde9ceb8c5e314665d44fbd7c3537a82707.tar.gz system_core-40a46dde9ceb8c5e314665d44fbd7c3537a82707.tar.bz2 | |
Adds libc++ versions of libbacktrace
Change-Id: I4a1ce30e7c2166ac1846cc90de0252beee542ee6
| -rw-r--r-- | libbacktrace/Android.build.mk | 6 | ||||
| -rwxr-xr-x | libbacktrace/Android.mk | 41 |
2 files changed, 46 insertions, 1 deletions
diff --git a/libbacktrace/Android.build.mk b/libbacktrace/Android.build.mk index 3c80cc2..76c7106 100644 --- a/libbacktrace/Android.build.mk +++ b/libbacktrace/Android.build.mk @@ -60,7 +60,11 @@ LOCAL_LDLIBS := \ $($(module)_ldlibs_$(build_type)) \ ifeq ($(build_type),target) - include external/stlport/libstlport.mk + ifneq ($(module)_libc++,) + include external/libcxx/libcxx.mk + else + include external/stlport/libstlport.mk + endif include $(BUILD_$(build_target)) endif diff --git a/libbacktrace/Android.mk b/libbacktrace/Android.mk index fa79221..13898ec 100755 --- a/libbacktrace/Android.mk +++ b/libbacktrace/Android.mk @@ -73,6 +73,47 @@ build_type := host include $(LOCAL_PATH)/Android.build.mk #------------------------------------------------------------------------- +# The libbacktrace library (libc++) +#------------------------------------------------------------------------- +libbacktrace_libc++_src_files := \ + BacktraceImpl.cpp \ + BacktraceMap.cpp \ + BacktraceThread.cpp \ + thread_utils.c \ + +libbacktrace_libc++_shared_libraries_target := \ + libcutils \ + libgccdemangle \ + +libbacktrace_libc++_src_files += \ + UnwindCurrent.cpp \ + UnwindMap.cpp \ + UnwindPtrace.cpp \ + +libbacktrace_libc++_c_includes := \ + external/libunwind/include \ + +libbacktrace_libc++_shared_libraries := \ + libunwind \ + libunwind-ptrace \ + +libbacktrace_libc++_shared_libraries_host := \ + liblog \ + +libbacktrace_libc++_static_libraries_host := \ + libcutils \ + +libbacktrace_libc++_libc++ := true + +module := libbacktrace_libc++ +module_tag := optional +build_type := target +build_target := SHARED_LIBRARY +include $(LOCAL_PATH)/Android.build.mk +build_type := host +include $(LOCAL_PATH)/Android.build.mk + +#------------------------------------------------------------------------- # The libbacktrace_test library needed by backtrace_test. #------------------------------------------------------------------------- libbacktrace_test_cflags := \ |