commit 87c0671e93b1c4304b2fc96caa7be1b28e523f4a
author Dave Platt <dplatt@google.com> Wed Mar 26 02:33:29 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Mar 26 02:33:29 2014 +0000
tree 028b72b14cdd78d528c459a6f4d15a735c9c10e2
parent 568349a095d72dee33667a82e3a24114019a33ae
parent c92617ccfaab73df4f17f32d470f9856f3fb094b

am c92617cc: Close FILE* handles after consuming contents

* commit 'c92617ccfaab73df4f17f32d470f9856f3fb094b':
  Close FILE* handles after consuming contents

Android.mk

diff --git a/Android.mk b/Android.mk
index 9d493dd..efad877 100644
--- a/Android.mk
+++ b/Android.mk
@@ -24,27 +24,40 @@
                     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_SYSTEM_SHARED_LIBRARIES := libc
-LOCAL_SHARED_LIBRARIES := libcutils liblog
-
+LOCAL_STATIC_LIBRARIES := libc libcutils liblog
+LOCAL_FORCE_STATIC_EXECUTABLE := true
 include $(BUILD_EXECUTABLE)
 
 ##########################
 
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES :=  mDNSShared/dnssd_clientlib.c  \
-                    mDNSShared/dnssd_clientstub.c \
-                    mDNSShared/dnssd_ipc.c
+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
 LOCAL_MODULE_TAGS := optional
-
-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 := libcutils liblog
-
+LOCAL_SHARED_LIBRARIES := $(commonLibs)
 include $(BUILD_SHARED_LIBRARY)
 
+include $(CLEAR_VARS)
+LOCAL_SRC_FILES := $(commonSources)
+LOCAL_MODULE := libmdnssd
+LOCAL_MODULE_TAGS := optional
+LOCAL_CFLAGS := $(commonFlags)
+LOCAL_STATIC_LIBRARIES := $(commonLibs)
+include $(BUILD_STATIC_LIBRARY)
+
 ############################
 
 include $(CLEAR_VARS)