diff options
author | Yabin Cui <yabinc@google.com> | 2016-04-14 21:38:12 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-04-14 21:38:12 +0000 |
commit | 3424eaa01d055e73b8a9389549fa7f9473b25954 (patch) | |
tree | 86331ecd5041f5272fa74c1a7a82a46eded7c3bf /libbacktrace | |
parent | 0c13b942ea35a6564dea3101d705de2d945c637b (diff) | |
parent | b1503248f4baa28ed739948a51da370bf40037ea (diff) | |
download | core-3424eaa01d055e73b8a9389549fa7f9473b25954.tar.gz core-3424eaa01d055e73b8a9389549fa7f9473b25954.tar.bz2 core-3424eaa01d055e73b8a9389549fa7f9473b25954.zip |
Merge "libbacktrace: only build libbacktrace_offline static library." am: f20e4b1
am: b150324
* commit 'b1503248f4baa28ed739948a51da370bf40037ea':
libbacktrace: only build libbacktrace_offline static library.
Change-Id: I903f82a38022f7094b70bc8e4d59ac5098456571
Diffstat (limited to 'libbacktrace')
-rw-r--r-- | libbacktrace/Android.mk | 66 |
1 files changed, 31 insertions, 35 deletions
diff --git a/libbacktrace/Android.mk b/libbacktrace/Android.mk index a8a7c4add..632b1b66b 100644 --- a/libbacktrace/Android.mk +++ b/libbacktrace/Android.mk @@ -95,7 +95,7 @@ libbacktrace_offline_src_files := \ BacktraceOffline.cpp \ # Use shared llvm library on device to save space. -libbacktrace_offline_shared_libraries := \ +libbacktrace_offline_shared_libraries_target := \ libbacktrace \ libbase \ liblog \ @@ -103,47 +103,20 @@ libbacktrace_offline_shared_libraries := \ libutils \ libLLVM \ -libbacktrace_offline_static_libraries := \ +libbacktrace_offline_static_libraries_target := \ libziparchive \ libz \ -module := libbacktrace_offline -build_type := target -build_target := SHARED_LIBRARY -include $(LOCAL_PATH)/Android.build.mk - -libbacktrace_offline_shared_libraries := \ - libbacktrace \ - libbase \ - liblog \ - libunwind \ - libziparchive-host \ - # Use static llvm libraries on host to remove dependency on 32-bit llvm shared library # which is not included in the prebuilt. -libbacktrace_offline_static_libraries := \ - libLLVMObject \ - libLLVMBitReader \ - libLLVMMC \ - libLLVMMCParser \ - libLLVMCore \ - libLLVMSupport \ - -module := libbacktrace_offline -build_type := host -libbacktrace_multilib := both -include $(LOCAL_PATH)/Android.build.mk - -libbacktrace_offline_shared_libraries := -libbacktrace_offline_static_libraries := \ +libbacktrace_offline_static_libraries_host := \ libbacktrace \ - libbase \ - libcutils \ - liblog \ libunwind \ - liblzma \ - libziparchive \ + libziparchive-host \ libz \ + libbase \ + liblog \ + libutils \ libLLVMObject \ libLLVMBitReader \ libLLVMMC \ @@ -154,6 +127,9 @@ libbacktrace_offline_static_libraries := \ module := libbacktrace_offline build_type := target build_target := STATIC_LIBRARY +libbacktrace_offline_multilib := both +include $(LOCAL_PATH)/Android.build.mk +build_type := host include $(LOCAL_PATH)/Android.build.mk #------------------------------------------------------------------------- @@ -200,13 +176,33 @@ backtrace_test_ldlibs_host := \ backtrace_test_shared_libraries := \ libbacktrace_test \ libbacktrace \ - libbacktrace_offline \ libbase \ libcutils \ + liblog \ libunwind \ backtrace_test_shared_libraries_target += \ libdl \ + libutils \ + libLLVM \ + +backtrace_test_static_libraries := \ + libbacktrace_offline \ + +backtrace_test_static_libraries_target := \ + libziparchive \ + libz \ + +backtrace_test_static_libraries_host := \ + libziparchive-host \ + libz \ + libutils \ + libLLVMObject \ + libLLVMBitReader \ + libLLVMMC \ + libLLVMMCParser \ + libLLVMCore \ + libLLVMSupport \ backtrace_test_ldlibs_host += \ -ldl \ |