summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2014-05-22 19:11:23 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-22 19:11:23 +0000
commit6b5f4c3413f993e36b37eecae15a53af8d8b9c43 (patch)
tree0851a67071ae3b782c3b41e75f9bc95d8a2e82cf
parentc5fa4b19e3ea88905a02cf28c59410638445c485 (diff)
parent0c7e5cdaebc96fb1aee8860303eaeab351acf4bc (diff)
downloadsystem_core-6b5f4c3413f993e36b37eecae15a53af8d8b9c43.zip
system_core-6b5f4c3413f993e36b37eecae15a53af8d8b9c43.tar.gz
system_core-6b5f4c3413f993e36b37eecae15a53af8d8b9c43.tar.bz2
am 0c7e5cda: Merge "libusbhost: Turn on -Werror"
* commit '0c7e5cdaebc96fb1aee8860303eaeab351acf4bc': libusbhost: Turn on -Werror
-rw-r--r--libusbhost/Android.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/libusbhost/Android.mk b/libusbhost/Android.mk
index acfc020..5c12f2c 100644
--- a/libusbhost/Android.mk
+++ b/libusbhost/Android.mk
@@ -25,6 +25,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := libusbhost
LOCAL_SRC_FILES := usbhost.c
+LOCAL_CFLAGS := -Werror
include $(BUILD_HOST_STATIC_LIBRARY)
@@ -38,7 +39,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := libusbhost
LOCAL_SRC_FILES := usbhost.c
-LOCAL_CFLAGS := -g -DUSE_LIBLOG
+LOCAL_CFLAGS := -g -DUSE_LIBLOG -Werror
# needed for logcat
LOCAL_SHARED_LIBRARIES := libcutils
@@ -52,5 +53,6 @@ include $(CLEAR_VARS)
LOCAL_MODULE := libusbhost
LOCAL_SRC_FILES := usbhost.c
+LOCAL_CFLAGS := -Werror
include $(BUILD_STATIC_LIBRARY)