From 9a1a3bcb164d331480100bd815f3bd89230ff9bc Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Fri, 26 Aug 2016 11:15:17 -0700 Subject: [PATCH] Replace libziparchive-host with libziparchive libziparchive-host is no longer necessary, and mixing libziparchive-host and libziparchive can cause ODR violations. Change-Id: I623c0c5579e28f26a6e1db7bd953f33ed1ca68cd --- tools/aapt/Android.mk | 2 +- tools/aapt2/Android.mk | 2 +- tools/split-select/Android.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/aapt/Android.mk b/tools/aapt/Android.mk index 2a490d1097ef5..04f46d9b27fc7 100644 --- a/tools/aapt/Android.mk +++ b/tools/aapt/Android.mk @@ -61,7 +61,7 @@ aaptHostStaticLibs := \ liblog \ libcutils \ libexpat \ - libziparchive-host \ + libziparchive \ libbase aaptCFlags := -DAAPT_VERSION=\"$(BUILD_NUMBER_FROM_FILE)\" diff --git a/tools/aapt2/Android.mk b/tools/aapt2/Android.mk index be2f88d3e3fd0..2e5fbdc6042c8 100644 --- a/tools/aapt2/Android.mk +++ b/tools/aapt2/Android.mk @@ -126,7 +126,7 @@ hostStaticLibs := \ liblog \ libcutils \ libexpat \ - libziparchive-host \ + libziparchive \ libpng \ libbase \ libprotobuf-cpp-lite diff --git a/tools/split-select/Android.mk b/tools/split-select/Android.mk index 863abae1e0fb9..199fafab6e052 100644 --- a/tools/split-select/Android.mk +++ b/tools/split-select/Android.mk @@ -51,7 +51,7 @@ hostStaticLibs := \ liblog \ libcutils \ libexpat \ - libziparchive-host \ + libziparchive \ libbase cFlags := -Wall -Werror