ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
* 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
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libbacktrace/Android.build.mk
View file

@ -73,6 +73,7 @@ endif
ifeq ($(build_type),host) ifeq ($(build_type),host)
# Only build if host builds are supported. # Only build if host builds are supported.
ifeq ($(build_host),true) ifeq ($(build_host),true)
LOCAL_CFLAGS += -Wno-extern-c-compat
ifneq ($($(module)_libc++),) ifneq ($($(module)_libc++),)
include external/libcxx/libcxx.mk include external/libcxx/libcxx.mk
endif endif

3
libziparchive/Android.mk
View file

@ -63,7 +63,8 @@ LOCAL_CPP_EXTENSION := .cc
LOCAL_CFLAGS += \ LOCAL_CFLAGS += \
-DGTEST_OS_LINUX \ -DGTEST_OS_LINUX \
-DGTEST_HAS_STD_STRING \ -DGTEST_HAS_STD_STRING \
-Werror -Werror \
-Wno-unnamed-type-template-args
LOCAL_SRC_FILES := zip_archive_test.cc LOCAL_SRC_FILES := zip_archive_test.cc
LOCAL_STATIC_LIBRARIES := libziparchive-host \ LOCAL_STATIC_LIBRARIES := libziparchive-host \
libz \ libz \