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

Commit 63dc310e authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Replace libziparchive-host with libziparchive" am: 611e205b 

am: 8c8bb250

Change-Id: Iaa10133cfcf424d82f170bf5b8b21487a982e5fb
parents 4019963b 8c8bb250

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