resolved conflicts for merge of af2bd086 to lmp-mr1-dev-plus-aosp
Change-Id: Ic8655447bac2d8a780fd21293cc3ccaa320d4eb8
diff --git a/Android.mk b/Android.mk
index e8f2179..381bcc1 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,5 +1,35 @@
LOCAL_PATH := $(call my-dir)
+commonSources := \
+ mDNSShared/dnssd_clientlib.c \
+ mDNSShared/dnssd_clientstub.c \
+ mDNSShared/dnssd_ipc.c
+
+commonLibs := libcutils liblog
+
+commonFlags := \
+ -O2 -g \
+ -fno-strict-aliasing \
+ -D_GNU_SOURCE \
+ -DHAVE_IPV6 \
+ -DHAVE_LINUX \
+ -DNOT_HAVE_SA_LEN \
+ -DPLATFORM_NO_RLIMIT \
+ -DTARGET_OS_LINUX \
+ -DUSES_NETLINK \
+ -DMDNS_DEBUGMSGS=0 \
+ -DMDNS_UDS_SERVERPATH=\"/dev/socket/mdnsd\" \
+ -DMDNS_USERNAME=\"mdnsr\" \
+ -W \
+ -Wall \
+ -Wextra \
+ -Wno-array-bounds \
+ -Wno-pointer-sign \
+ -Wno-unused \
+ -Wno-unused-but-set-variable \
+ -Wno-unused-parameter \
+ -Werror=implicit-function-declaration \
+
#########################
include $(CLEAR_VARS)
@@ -23,29 +53,14 @@
external/mdnsresponder/mDNSCore \
external/mdnsresponder/mDNSShared
-LOCAL_CFLAGS := -O2 -g -W -Wall -D__ANDROID__ -D_GNU_SOURCE -DHAVE_IPV6 -DNOT_HAVE_SA_LEN -DUSES_NETLINK -DTARGET_OS_LINUX -fno-strict-aliasing -DHAVE_LINUX -DMDNS_DEBUGMSGS=0 -DMDNS_UDS_SERVERPATH=\"/dev/socket/mdnsd\" -DMDNS_USERNAME=\"mdnsr\" -DPLATFORM_NO_RLIMIT
+LOCAL_CFLAGS := $(commonFlags)
-LOCAL_CFLAGS += \
- -Wno-pointer-sign \
-
-
-LOCAL_STATIC_LIBRARIES := libc libcutils liblog
+LOCAL_STATIC_LIBRARIES := $(commonLibs) libc
LOCAL_FORCE_STATIC_EXECUTABLE := true
include $(BUILD_EXECUTABLE)
##########################
-commonSources := \
- mDNSShared/dnssd_clientlib.c \
- mDNSShared/dnssd_clientstub.c \
- mDNSShared/dnssd_ipc.c
-
-commonLibs := libcutils liblog
-
-commonFlags := -O2 -g -W -Wall -D__ANDROID__ -D_GNU_SOURCE -DHAVE_IPV6 \
- -DNOT_HAVE_SA_LEN -DUSES_NETLINK -DTARGET_OS_LINUX -fno-strict-aliasing \
- -DHAVE_LINUX -DMDNS_UDS_SERVERPATH=\"/dev/socket/mdnsd\" -DMDNS_DEBUGMSGS=0
-
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(commonSources)
LOCAL_MODULE := libmdnssd
@@ -53,6 +68,7 @@
LOCAL_CFLAGS := $(commonFlags)
LOCAL_SYSTEM_SHARED_LIBRARIES := libc
LOCAL_SHARED_LIBRARIES := $(commonLibs)
+LOCAL_EXPORT_C_INCLUDE_DIRS := external/mdnsresponder/mDNSShared
include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS)
@@ -61,27 +77,20 @@
LOCAL_MODULE_TAGS := optional
LOCAL_CFLAGS := $(commonFlags)
LOCAL_STATIC_LIBRARIES := $(commonLibs)
+LOCAL_EXPORT_C_INCLUDE_DIRS := external/mdnsresponder/mDNSShared
include $(BUILD_STATIC_LIBRARY)
############################
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := Clients/dns-sd.c \
- Clients/ClientCommon.c
-
+LOCAL_SRC_FILES := Clients/dns-sd.c Clients/ClientCommon.c
LOCAL_MODULE := dnssd
LOCAL_MODULE_TAGS := optional
-
-LOCAL_C_INCLUDES := external/mdnsresponder/mDNSShared
-
-LOCAL_CFLAGS := -O2 -g -W -Wall -D__ANDROID__ -D_GNU_SOURCE -DHAVE_IPV6 -DNOT_HAVE_SA_LEN -DUSES_NETLINK -DTARGET_OS_LINUX -fno-strict-aliasing -DHAVE_LINUX -DMDNS_UDS_SERVERPATH=\"/dev/socket/mdnsd\" -DMDNS_DEBUGMSGS=0
-
+LOCAL_CFLAGS := $(commonFlags)
LOCAL_SYSTEM_SHARED_LIBRARIES := libc
LOCAL_SHARED_LIBRARIES := libmdnssd libcutils liblog
-
include $(BUILD_EXECUTABLE)
-
############################
# This builds an mDns that is embeddable within GmsCore for the nearby connections API
@@ -108,34 +117,14 @@
external/mdnsresponder/mDNSShared
LOCAL_CFLAGS += -Os -fvisibility=hidden
-LOCAL_CFLAGS += -DANDROID -D__ANDROID__
-LOCAL_CFLAGS += -D_GNU_SOURCE \
- -DHAVE_IPV6 \
- -DNOT_HAVE_SA_LEN \
- -DUSES_NETLINK \
- -DTARGET_OS_LINUX \
- -fno-strict-aliasing \
- -DHAVE_LINUX \
+LOCAL_CFLAGS += $(commonFlags) \
+ -UMDNS_DEBUGMSGS \
-DMDNS_DEBUGMSGS=0 \
- -DMDNS_UDS_SERVERPATH=\"/dev/socket/mdnsd\" \
- -DMDNS_USERNAME=\"mdnsr\" \
- -DPLATFORM_NO_RLIMIT \
-DSO_REUSEADDR \
-DUNICAST_DISABLED
-LOCAL_CFLAGS += -Wno-unused-but-set-variable \
- -Wno-array-bounds \
- -Wno-pointer-sign \
- -Werror \
- -Wall \
- -Wextra \
- -Wno-unused \
- -Wno-unused-parameter \
- -Werror=implicit-function-declaration
-
ifeq ($(TARGET_BUILD_TYPE),debug)
LOCAL_CFLAGS += -O0 -UNDEBUG -fno-omit-frame-pointer
endif
include $(BUILD_STATIC_LIBRARY)
-
