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

Commit 99f6b867 authored by Colin Cross's avatar Colin Cross
Browse files

Replace libziparchive-host with libziparchive 

libziparchive-host is no longer necessary, and mixing libziparchive-host
and libziparchive can cause ODR violations.

Change-Id: I27b2cc9974000ee7bf1d1ac15fd7b069862d9b01
parent 3a07e5bf

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 \