diff options
| author | Tim Murray <timmurray@google.com> | 2014-07-17 16:36:46 -0700 |
|---|---|---|
| committer | Tim Murray <timmurray@google.com> | 2014-07-24 12:18:22 -0700 |
| commit | 06fce9db05034fd743363e7ca827a9b630c33a6e (patch) | |
| tree | cbc624f8a1b7b6b275ad843280af32b475a539ad | |
| parent | bf300e1e04726528bf2fefac89e5e73aaff1d68e (diff) | |
| download | system_core-06fce9db05034fd743363e7ca827a9b630c33a6e.zip system_core-06fce9db05034fd743363e7ca827a9b630c33a6e.tar.gz system_core-06fce9db05034fd743363e7ca827a9b630c33a6e.tar.bz2 | |
Update makefiles for host clang.
bug 16172793
Change-Id: If7484c5dbcccce7d925bec97bff0a3e4c30e9434
| -rw-r--r-- | libbacktrace/Android.build.mk | 1 | ||||
| -rw-r--r-- | libziparchive/Android.mk | 3 |
2 files changed, 3 insertions, 1 deletions
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 @@ 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 705caa5..d96bc63 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 \ |