diff options
| author | Dan Albert <danalbert@google.com> | 2014-05-19 18:33:51 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-19 18:33:51 +0000 |
| commit | 7ce29b5826fca294319fd93f1dcf96f3e0479047 (patch) | |
| tree | 08fedbb97c2d0771dbf22b9d5d3f853ecd52cbc8 /libbacktrace | |
| parent | bb8e90e87e9dd89a47a659e0e4a669177d750d52 (diff) | |
| parent | e9b36f1a9a280877cb130452c50af6a51360a203 (diff) | |
| download | system_core-7ce29b5826fca294319fd93f1dcf96f3e0479047.tar.gz system_core-7ce29b5826fca294319fd93f1dcf96f3e0479047.tar.bz2 system_core-7ce29b5826fca294319fd93f1dcf96f3e0479047.zip | |
am e9b36f1a: am 888f95e2: am f03bd953: Merge "Adds libc++ versions of libbacktrace"
* commit 'e9b36f1a9a280877cb130452c50af6a51360a203':
Adds libc++ versions of libbacktrace
Diffstat (limited to 'libbacktrace')
| -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 3c80cc26d..76c710640 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 fa792218a..13898ec44 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 := \ |