Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1503248 authored by Yabin Cui's avatar Yabin Cui Committed by android-build-merger
Browse files

Merge "libbacktrace: only build libbacktrace_offline static library." 

am: f20e4b1b

* commit 'f20e4b1b':
  libbacktrace: only build libbacktrace_offline static library.

Change-Id: I6e00010154f97deefb9bcb9901b807e833eab9fb
parents 3c1cd702 f20e4b1b

libbacktrace/Android.mk

+31 −35
Original line number Original line Diff line number Diff line
@@ -95,7 +95,7 @@ libbacktrace_offline_src_files := \ 
	BacktraceOffline.cpp \

	BacktraceOffline.cpp \





# Use shared llvm library on device to save space.

# Use shared llvm library on device to save space.

libbacktrace_offline_shared_libraries := \

libbacktrace_offline_shared_libraries_target := \

	libbacktrace \

	libbacktrace \

	libbase \

	libbase \

	liblog \

	liblog \
@@ -103,47 +103,20 @@ libbacktrace_offline_shared_libraries := \ 
	libutils \

	libutils \

	libLLVM \

	libLLVM \





libbacktrace_offline_static_libraries := \

libbacktrace_offline_static_libraries_target := \

	libziparchive \

	libziparchive \

	libz \

	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

# Use static llvm libraries on host to remove dependency on 32-bit llvm shared library

# which is not included in the prebuilt.

# which is not included in the prebuilt.

libbacktrace_offline_static_libraries := \

libbacktrace_offline_static_libraries_host := \

	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 \

	libbacktrace \

	libbase \

	libcutils \

	liblog \

	libunwind \

	libunwind \

	liblzma \

	libziparchive-host \

	libziparchive \

	libz \

	libz \

	libbase \

	liblog \

	libutils \

	libLLVMObject \

	libLLVMObject \

	libLLVMBitReader \

	libLLVMBitReader \

	libLLVMMC \

	libLLVMMC \
@@ -154,6 +127,9 @@ libbacktrace_offline_static_libraries := \ 
module := libbacktrace_offline

module := libbacktrace_offline

build_type := target

build_type := target

build_target := STATIC_LIBRARY

build_target := STATIC_LIBRARY

libbacktrace_offline_multilib := both

include $(LOCAL_PATH)/Android.build.mk

build_type := host

include $(LOCAL_PATH)/Android.build.mk

include $(LOCAL_PATH)/Android.build.mk





#-------------------------------------------------------------------------

#-------------------------------------------------------------------------
@@ -200,13 +176,33 @@ backtrace_test_ldlibs_host := \ 
backtrace_test_shared_libraries := \

backtrace_test_shared_libraries := \

	libbacktrace_test \

	libbacktrace_test \

	libbacktrace \

	libbacktrace \

	libbacktrace_offline \

	libbase \

	libbase \

	libcutils \

	libcutils \

	liblog \

	libunwind \

	libunwind \





backtrace_test_shared_libraries_target += \

backtrace_test_shared_libraries_target += \

	libdl \

	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 += \

backtrace_test_ldlibs_host += \

	-ldl \

	-ldl \