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

* commit '83ddddaaba0fea8a1c0dcc64e795112bed67815f': Update makefiles for host clang.
2014-07-25 01:03:31 +00:00 · 2014-07-25 01:03:31 +00:00 · 650f43d0d5
commit 650f43d0d5
parent d7c28d467b 83ddddaaba
2 changed files with 3 additions and 1 deletions
--- 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
--- 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 \