From 99f6b86733e995bda177948462ae1260689355ea Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Fri, 26 Aug 2016 11:12:38 -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: I27b2cc9974000ee7bf1d1ac15fd7b069862d9b01 --- fastboot/Android.mk | 2 +- libbacktrace/Android.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fastboot/Android.mk b/fastboot/Android.mk index 1b4ecbe51..28e3d4b46 100644 --- a/fastboot/Android.mk +++ b/fastboot/Android.mk @@ -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 \ diff --git a/libbacktrace/Android.mk b/libbacktrace/Android.mk index 9bb113a75..56a397016 100644 --- a/libbacktrace/Android.mk +++ b/libbacktrace/Android.mk @@ -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 \