diff options
| author | Elliott Hughes <enh@google.com> | 2014-12-06 20:54:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-12-06 20:54:24 +0000 |
| commit | dd75ad0a7679e9c93aab36f9cb04527fc29386e6 (patch) | |
| tree | f56587b736dc8589ab76f35c95a603c63f334cb4 | |
| parent | a413bce2d767d5b0810016f9b49a69c1e4be2b2f (diff) | |
| parent | 95c5a47184eacf12ea92c47846b5c461fd8b8360 (diff) | |
| download | mdnsresponder-lollipop-wear-release.tar.gz | |
Merge "Clean up Android.mk"android-wear-5.0.0_r1lollipop-wear-release
| -rw-r--r-- | Android.mk | 64 |
1 files changed, 32 insertions, 32 deletions
@@ -1,33 +1,5 @@ LOCAL_PATH := $(call my-dir) -######################### - -include $(CLEAR_VARS) -LOCAL_SRC_FILES := mDNSPosix/PosixDaemon.c \ - mDNSPosix/mDNSPosix.c \ - mDNSPosix/mDNSUNP.c \ - mDNSCore/mDNS.c \ - mDNSCore/DNSDigest.c \ - mDNSCore/uDNS.c \ - mDNSCore/DNSCommon.c \ - mDNSShared/uds_daemon.c \ - mDNSShared/mDNSDebug.c \ - mDNSShared/dnssd_ipc.c \ - mDNSShared/GenLinkedList.c \ - mDNSShared/PlatformCommon.c - -LOCAL_MODULE := mdnsd -LOCAL_MODULE_TAGS := optional - -LOCAL_C_INCLUDES := external/mdnsresponder/mDNSPosix \ - 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_STATIC_LIBRARIES := libc libcutils liblog -LOCAL_FORCE_STATIC_EXECUTABLE := true -include $(BUILD_EXECUTABLE) - ########################## commonSources := \ @@ -48,6 +20,7 @@ LOCAL_MODULE_TAGS := optional 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) @@ -56,6 +29,7 @@ LOCAL_MODULE := libmdnssd LOCAL_MODULE_TAGS := optional LOCAL_CFLAGS := $(commonFlags) LOCAL_STATIC_LIBRARIES := $(commonLibs) +LOCAL_EXPORT_C_INCLUDE_DIRS := external/mdnsresponder/mDNSShared include $(BUILD_STATIC_LIBRARY) ############################ @@ -67,11 +41,37 @@ LOCAL_SRC_FILES := Clients/dns-sd.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) -DMDNS_USERNAME=\"mdnsr\" -DPLATFORM_NO_RLIMIT LOCAL_SYSTEM_SHARED_LIBRARIES := libc -LOCAL_SHARED_LIBRARIES := libmdnssd libcutils liblog +LOCAL_SHARED_LIBRARIES := libmdnssd $(commonLibs) include $(BUILD_EXECUTABLE) + +######################### + +include $(CLEAR_VARS) +LOCAL_SRC_FILES := mDNSPosix/PosixDaemon.c \ + mDNSPosix/mDNSPosix.c \ + mDNSPosix/mDNSUNP.c \ + mDNSCore/mDNS.c \ + mDNSCore/DNSDigest.c \ + mDNSCore/uDNS.c \ + mDNSCore/DNSCommon.c \ + mDNSShared/uds_daemon.c \ + mDNSShared/mDNSDebug.c \ + mDNSShared/dnssd_ipc.c \ + mDNSShared/GenLinkedList.c \ + mDNSShared/PlatformCommon.c + +LOCAL_MODULE := mdnsd +LOCAL_MODULE_TAGS := optional + +LOCAL_C_INCLUDES := external/mdnsresponder/mDNSPosix \ + external/mdnsresponder/mDNSCore \ + external/mdnsresponder/mDNSShared + +LOCAL_CFLAGS := $(commonFlags) -DMDNS_USERNAME=\"mdnsr\" -DPLATFORM_NO_RLIMIT +LOCAL_STATIC_LIBRARIES := libc $(commonLibs) +LOCAL_FORCE_STATIC_EXECUTABLE := true +include $(BUILD_EXECUTABLE) |