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

* commit '4795ce066024c7ab235cb0c6bb229b0b6d9e5878':
  Update makefiles for host clang.
This commit is contained in:
Tim Murray 2014-07-24 21:04:24 +00:00 committed by Android Git Automerger
commit 83ddddaaba
2 changed files with 3 additions and 1 deletions

View file

@ -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

View file

@ -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 \