summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChih-Hung Hsieh <chh@google.com>2017-11-22 07:10:31 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-11-22 07:10:31 +0000
commit8aadca5e056037f5984fbe6033645e72685e5801 (patch)
tree9211253845f11221a6ca5d4ab4b2da021d8721e3
parentbbc17e0debc0d07ea02038c4a1187883609d4c33 (diff)
parent1521972c6a49c285d469d59c4645bf010e108a82 (diff)
downloadlibufdt-8aadca5e056037f5984fbe6033645e72685e5801.tar.gz
Suppress format warnings due to size_t/ulong mismatch.android-wear-8.0.0_r1
am: 1521972c6a Change-Id: I9e8f1afca0b00070b53840ad3d7d555a639d32e7
-rw-r--r--tests/src/Android.mk6
-rw-r--r--utils/src/Android.mk6
2 files changed, 4 insertions, 8 deletions
diff --git a/tests/src/Android.mk b/tests/src/Android.mk
index 03982d8..c5cc72f 100644
--- a/tests/src/Android.mk
+++ b/tests/src/Android.mk
@@ -14,11 +14,9 @@
LOCAL_PATH:= $(call my-dir)
-ifeq ($(HOST_OS),darwin)
-# No -Werror for darwin yet. Need to fix/suppress more warnings.
-libufdt_tests_cflags := -Wall
-else
libufdt_tests_cflags := -Wall -Werror
+ifeq ($(HOST_OS),darwin)
+libufdt_tests_cflags += -Wno-error=format
endif
###################################################
diff --git a/utils/src/Android.mk b/utils/src/Android.mk
index c7ede7f..21d4279 100644
--- a/utils/src/Android.mk
+++ b/utils/src/Android.mk
@@ -19,11 +19,9 @@ LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := mkdtimg
-ifeq ($(HOST_OS),darwin)
-# No -Werror for darwin yet. Need to fix/suppress more warnings.
-LOCAL_CFLAGS := -Wall -Wno-error=format
-else
LOCAL_CFLAGS := -Wall -Werror
+ifeq ($(HOST_OS),darwin)
+LOCAL_CFLAGS += -Wno-error=format
endif
LOCAL_SRC_FILES := \
mkdtimg.c \