commit 8e376e01e7c9467f5da6d2fd01db824be811a3f7
author Tao Bao <tbao@google.com> Wed Nov 15 23:07:38 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Nov 15 23:07:38 2017 +0000
tree 1cdf1215721aa7cff9ff6386a1cc8c8436624c12
parent 60ee0268496d3e73f4f33dffe64cace0da104ca4
parent 97a4750098f95e87bdc29686159ea3df67d71b64

Merge "minadbd: Remove two warning options." am: 7bd61f0cc0 am: 345f350540
am: 97a4750098

Change-Id: I5b8199d02212b0b2283e647effa3b1829704e27c

minadbd/Android.mk

diff --git a/minadbd/Android.mk b/minadbd/Android.mk
index 3c9ab3a..50e3b34 100644
--- a/minadbd/Android.mk
+++ b/minadbd/Android.mk
@@ -16,10 +16,9 @@
 
 minadbd_cflags := \
     -Wall -Werror \
-    -Wno-missing-field-initializers \
     -DADB_HOST=0 \
 
-# libadbd (static library)
+# libminadbd (static library)
 # ===============================
 include $(CLEAR_VARS)
 
@@ -30,7 +29,6 @@
 
 LOCAL_MODULE := libminadbd
 LOCAL_CFLAGS := $(minadbd_cflags)
-LOCAL_CONLY_FLAGS := -Wimplicit-function-declaration
 LOCAL_C_INCLUDES := bootable/recovery system/core/adb
 LOCAL_WHOLE_STATIC_LIBRARIES := libadbd
 LOCAL_STATIC_LIBRARIES := libcrypto libbase