summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Salyzyn2014-05-21 19:33:57 -0500
committerAndroid Git Automerger2014-05-21 19:33:57 -0500
commit51d65e6db930b32cbe477188e9a6bc56f901d4bc (patch)
treeb7051fbb428394e111bdb6b24390b95105e23d09 /libnetutils
parentfd04f91dffa3d574d8df169e4a93a2c7cc908fcf (diff)
parent2a7ce0bc7da0201c4b228d04d900ec440bfdcf8b (diff)
downloadplatform-system-core-51d65e6db930b32cbe477188e9a6bc56f901d4bc.tar.gz
platform-system-core-51d65e6db930b32cbe477188e9a6bc56f901d4bc.tar.xz
platform-system-core-51d65e6db930b32cbe477188e9a6bc56f901d4bc.zip
am 2a7ce0bc: am 9a12e952: am 5b7bb03e: Merge "Revert "libnetutils: Turn on -Werror""
* commit '2a7ce0bc7da0201c4b228d04d900ec440bfdcf8b': Revert "libnetutils: Turn on -Werror"
Diffstat (limited to 'libnetutils')
-rw-r--r--libnetutils/Android.mk8
1 files changed, 3 insertions, 5 deletions
diff --git a/libnetutils/Android.mk b/libnetutils/Android.mk
index 1f61511e9..aba462184 100644
--- a/libnetutils/Android.mk
+++ b/libnetutils/Android.mk
@@ -1,7 +1,7 @@
1LOCAL_PATH := $(call my-dir) 1LOCAL_PATH:= $(call my-dir)
2include $(CLEAR_VARS) 2include $(CLEAR_VARS)
3 3
4LOCAL_SRC_FILES := \ 4LOCAL_SRC_FILES:= \
5 dhcpclient.c \ 5 dhcpclient.c \
6 dhcpmsg.c \ 6 dhcpmsg.c \
7 dhcp_utils.c \ 7 dhcp_utils.c \
@@ -12,8 +12,6 @@ LOCAL_SHARED_LIBRARIES := \
12 libcutils \ 12 libcutils \
13 liblog 13 liblog
14 14
15LOCAL_MODULE := libnetutils 15LOCAL_MODULE:= libnetutils
16
17LOCAL_CFLAGS := -Werror
18 16
19include $(BUILD_SHARED_LIBRARY) 17include $(BUILD_SHARED_LIBRARY)