summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao2017-11-15 17:04:09 -0600
committerandroid-build-merger2017-11-15 17:04:09 -0600
commit345f3505404b55ea0e3958eda6dd46990bcb30eb (patch)
tree0940c176df1d57e5fb6f5f24ec63d970aa025e7c
parentc418bfeae21a12df2a448217c77c67cac5eff0e0 (diff)
parent7bd61f0cc047786d96521eda40cef92ce2f91e49 (diff)
downloadplatform-bootable-recovery-345f3505404b55ea0e3958eda6dd46990bcb30eb.tar.gz
platform-bootable-recovery-345f3505404b55ea0e3958eda6dd46990bcb30eb.tar.xz
platform-bootable-recovery-345f3505404b55ea0e3958eda6dd46990bcb30eb.zip
Merge "minadbd: Remove two warning options."
am: 7bd61f0cc0 Change-Id: Id5e986ecd00cb2b953d761957a987a1b0c5ebf20
-rw-r--r--minadbd/Android.mk4
1 files changed, 1 insertions, 3 deletions
diff --git a/minadbd/Android.mk b/minadbd/Android.mk
index 3c9ab3a7..50e3b34e 100644
--- a/minadbd/Android.mk
+++ b/minadbd/Android.mk
@@ -16,10 +16,9 @@ LOCAL_PATH:= $(call my-dir)
16 16
17minadbd_cflags := \ 17minadbd_cflags := \
18 -Wall -Werror \ 18 -Wall -Werror \
19 -Wno-missing-field-initializers \
20 -DADB_HOST=0 \ 19 -DADB_HOST=0 \
21 20
22# libadbd (static library) 21# libminadbd (static library)
23# =============================== 22# ===============================
24include $(CLEAR_VARS) 23include $(CLEAR_VARS)
25 24
@@ -30,7 +29,6 @@ LOCAL_SRC_FILES := \
30 29
31LOCAL_MODULE := libminadbd 30LOCAL_MODULE := libminadbd
32LOCAL_CFLAGS := $(minadbd_cflags) 31LOCAL_CFLAGS := $(minadbd_cflags)
33LOCAL_CONLY_FLAGS := -Wimplicit-function-declaration
34LOCAL_C_INCLUDES := bootable/recovery system/core/adb 32LOCAL_C_INCLUDES := bootable/recovery system/core/adb
35LOCAL_WHOLE_STATIC_LIBRARIES := libadbd 33LOCAL_WHOLE_STATIC_LIBRARIES := libadbd
36LOCAL_STATIC_LIBRARIES := libcrypto libbase 34LOCAL_STATIC_LIBRARIES := libcrypto libbase