From 06fce9db05034fd743363e7ca827a9b630c33a6e Mon Sep 17 00:00:00 2001
From: Tim Murray <timmurray@google.com>
Date: Thu, 17 Jul 2014 16:36:46 -0700
Subject: [PATCH] Update makefiles for host clang.

bug 16172793

Change-Id: If7484c5dbcccce7d925bec97bff0a3e4c30e9434
---
 libbacktrace/Android.build.mk | 1 +
 libziparchive/Android.mk      | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/libbacktrace/Android.build.mk b/libbacktrace/Android.build.mk
index 2f5564533..2685380ee 100644
--- a/libbacktrace/Android.build.mk
+++ b/libbacktrace/Android.build.mk
@@ -73,6 +73,7 @@ endif
 ifeq ($(build_type),host)
   # Only build if host builds are supported.
   ifeq ($(build_host),true)
+    LOCAL_CFLAGS += -Wno-extern-c-compat
     ifneq ($($(module)_libc++),)
       include external/libcxx/libcxx.mk
     endif
diff --git a/libziparchive/Android.mk b/libziparchive/Android.mk
index 705caa5a1..d96bc63ed 100644
--- a/libziparchive/Android.mk
+++ b/libziparchive/Android.mk
@@ -63,7 +63,8 @@ LOCAL_CPP_EXTENSION := .cc
 LOCAL_CFLAGS += \
     -DGTEST_OS_LINUX \
     -DGTEST_HAS_STD_STRING \
-    -Werror
+    -Werror \
+    -Wno-unnamed-type-template-args
 LOCAL_SRC_FILES := zip_archive_test.cc
 LOCAL_STATIC_LIBRARIES := libziparchive-host \
 	libz \