diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-12 22:12:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-11-12 22:12:34 +0000 |
| commit | ca1797ae00d3b5bf2eb4d1cad5bb68cef0074346 (patch) | |
| tree | fa53cf24f51906a9b1fef6afaed69b06cfd4eaf9 | |
| parent | 06279285ae38b58988a9431c89b8689d8e16904e (diff) | |
| parent | 0d7164d4dd09cf56c15dba34fe51cb84f7bb065f (diff) | |
| download | core-ca1797ae00d3b5bf2eb4d1cad5bb68cef0074346.tar.gz core-ca1797ae00d3b5bf2eb4d1cad5bb68cef0074346.tar.bz2 core-ca1797ae00d3b5bf2eb4d1cad5bb68cef0074346.zip | |
Merge "Remove the stlport linked libbacktrace."
| -rw-r--r-- | libbacktrace/Android.build.mk | 6 | ||||
| -rwxr-xr-x | libbacktrace/Android.mk | 66 |
2 files changed, 1 insertions, 71 deletions
diff --git a/libbacktrace/Android.build.mk b/libbacktrace/Android.build.mk index 2685380ee..7e1cd53e5 100644 --- a/libbacktrace/Android.build.mk +++ b/libbacktrace/Android.build.mk @@ -61,12 +61,6 @@ LOCAL_LDLIBS := \ $($(module)_ldlibs_$(build_type)) \ ifeq ($(build_type),target) - 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 c321369ba..e2c0a4d4b 100755 --- a/libbacktrace/Android.mk +++ b/libbacktrace/Android.mk @@ -70,54 +70,9 @@ build_type := target build_target := SHARED_LIBRARY include $(LOCAL_PATH)/Android.build.mk build_type := host +libbacktrace_multilib := both include $(LOCAL_PATH)/Android.build.mk -# Don't build for unbundled branches -ifeq (,$(TARGET_BUILD_APPS)) -#------------------------------------------------------------------------- -# 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 -libbacktrace_libc++_multilib := both -include $(LOCAL_PATH)/Android.build.mk -libbacktrace_libc++_multilib := -endif - #------------------------------------------------------------------------- # The libbacktrace_test library needed by backtrace_test. #------------------------------------------------------------------------- @@ -188,23 +143,4 @@ LOCAL_SRC_FILES := \ include $(BUILD_HOST_SHARED_LIBRARY) -# Don't build for unbundled branches -ifeq (,$(TARGET_BUILD_APPS)) -#------------------------------------------------------------------------- -# The libbacktrace library (libc++) -#------------------------------------------------------------------------- -include $(CLEAR_VARS) - -LOCAL_MODULE := libbacktrace_libc++ -LOCAL_MODULE_TAGS := optional - -LOCAL_SRC_FILES := \ - BacktraceMap.cpp \ - -LOCAL_MULTILIB := both - -include $(BUILD_HOST_SHARED_LIBRARY) - -endif # TARGET_BUILD_APPS - endif # HOST_OS-darwin |