commit 06fce9db05034fd743363e7ca827a9b630c33a6e
author Tim Murray <timmurray@google.com> Thu Jul 17 16:36:46 2014 -0700
committer Tim Murray <timmurray@google.com> Thu Jul 24 12:18:22 2014 -0700
tree cbc624f8a1b7b6b275ad843280af32b475a539ad
parent bf300e1e04726528bf2fefac89e5e73aaff1d68e

Update makefiles for host clang.

bug 16172793

Change-Id: If7484c5dbcccce7d925bec97bff0a3e4c30e9434

libbacktrace/Android.build.mk

diff --git a/libbacktrace/Android.build.mk b/libbacktrace/Android.build.mk
index 2f55645..2685380 100644
--- a/libbacktrace/Android.build.mk
+++ b/libbacktrace/Android.build.mk
@@ -73,6 +73,7 @@
 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

libziparchive/Android.mk

diff --git a/libziparchive/Android.mk b/libziparchive/Android.mk
index 705caa5..d96bc63 100644
--- a/libziparchive/Android.mk
+++ b/libziparchive/Android.mk
@@ -63,7 +63,8 @@
 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 \