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

Commit 4379ca6d authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Replace libziparchive-host with libziparchive" am: 091b6319 

am: 904c1042

Change-Id: I3e3a49fb45d5387af675e8d7b20974796d3ee962
parents ade38762 904c1042

fastboot/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ LOCAL_LDLIBS_windows := -lws2_32 
LOCAL_C_INCLUDES_windows := development/host/windows/usb/api



LOCAL_STATIC_LIBRARIES := \

    libziparchive-host \

    libziparchive \

    libext4_utils_host \

    libsparse_host \

    libutils \

libbacktrace/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ libbacktrace_offline_static_libraries_target := \ 
libbacktrace_offline_static_libraries_host := \

	libbacktrace \

	libunwind \

	libziparchive-host \

	libziparchive \

	libz \

	libbase \

	liblog \
@@ -129,7 +129,7 @@ backtrace_test_static_libraries_target := \ 
	libz \



backtrace_test_static_libraries_host := \

	libziparchive-host \

	libziparchive \

	libz \

	libutils \

	libLLVMObject \