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

Commit 9a1a3bcb 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: I623c0c5579e28f26a6e1db7bd953f33ed1ca68cd
parent 0a357a1a

tools/aapt/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ aaptHostStaticLibs := \ 
    liblog \

    libcutils \

    libexpat \

    libziparchive-host \

    libziparchive \

    libbase



aaptCFlags := -DAAPT_VERSION=\"$(BUILD_NUMBER_FROM_FILE)\"

tools/aapt2/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ hostStaticLibs := \ 
	liblog \

	libcutils \

	libexpat \

	libziparchive-host \

	libziparchive \

	libpng \

	libbase \

	libprotobuf-cpp-lite

tools/split-select/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ hostStaticLibs := \ 
    liblog \

    libcutils \

    libexpat \

    libziparchive-host \

    libziparchive \

    libbase



cFlags := -Wall -Werror