commit 650f43d0d567851a36dd136643aa3873b12e6132
author Tim Murray <timmurray@google.com> Fri Jul 25 01:03:31 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Jul 25 01:03:31 2014 +0000
tree 82007e7caf647d2e7684187748702a64a5a043e8
parent d7c28d467b26839a3e7540bcd8c25aeef31f3b50
parent 83ddddaaba0fea8a1c0dcc64e795112bed67815f

am 83ddddaa: am 4795ce06: Merge "Update makefiles for host clang."

* commit '83ddddaaba0fea8a1c0dcc64e795112bed67815f':
  Update makefiles for host clang.

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 \