diff options
| author | Dan Rodney <danrodney@google.com> | 2015-01-20 17:03:46 -0600 |
|---|---|---|
| committer | Dan Rodney <danrodney@google.com> | 2015-01-20 17:03:46 -0600 |
| commit | 8352d7a311ae3f7838cc9d9ee0d69625f73b89e6 (patch) | |
| tree | 043680fc9f6d686dfeb8ac5a0129b6fdc61fb3e8 | |
| parent | 27209ff8d25be29db541a9772a0da818b4b834b8 (diff) | |
| parent | af2bd0869f68c9ab48c2a5bb7ffd2fda78789666 (diff) | |
| download | mdnsresponder-marshmallow-mr1-dev.tar.gz | |
resolved conflicts for merge of af2bd086 to lmp-mr1-dev-plus-aospandroid-wear-5.1.1_r1android-wear-5.1.0_r1android-cts-6.0_r9android-cts-6.0_r8android-cts-6.0_r7android-cts-6.0_r6android-cts-6.0_r5android-cts-6.0_r4android-cts-6.0_r32android-cts-6.0_r31android-cts-6.0_r30android-cts-6.0_r3android-cts-6.0_r29android-cts-6.0_r28android-cts-6.0_r27android-cts-6.0_r26android-cts-6.0_r25android-cts-6.0_r24android-cts-6.0_r23android-cts-6.0_r22android-cts-6.0_r21android-cts-6.0_r20android-cts-6.0_r2android-cts-6.0_r19android-cts-6.0_r18android-cts-6.0_r17android-cts-6.0_r16android-cts-6.0_r15android-cts-6.0_r14android-cts-6.0_r13android-cts-6.0_r12android-cts-6.0_r1android-6.0.0_r7android-6.0.0_r6android-6.0.0_r5android-6.0.0_r4android-6.0.0_r3android-6.0.0_r26android-6.0.0_r25android-6.0.0_r24android-6.0.0_r23android-6.0.0_r2android-6.0.0_r13android-6.0.0_r12android-6.0.0_r11android-6.0.0_r1master-soongmarshmallow-releasemarshmallow-mr1-devmarshmallow-dr-releasemarshmallow-dr-devmarshmallow-devmarshmallow-cts-release
Change-Id: Ic8655447bac2d8a780fd21293cc3ccaa320d4eb8
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -92,7 +92,7 @@ LOCAL_SHARED_LIBRARIES := libmdnssd libcutils liblog include $(BUILD_EXECUTABLE) ############################ -# This builds an mDns that is embeddable within GmsCore for the local apps connection API +# This builds an mDns that is embeddable within GmsCore for the nearby connections API ### STATIC LIB ### include $(CLEAR_VARS) @@ -119,7 +119,7 @@ LOCAL_C_INCLUDES := external/mdnsresponder/mDNSPosix \ LOCAL_CFLAGS += -Os -fvisibility=hidden LOCAL_CFLAGS += $(commonFlags) \ -UMDNS_DEBUGMSGS \ - -DMDNS_DEBUGMSGS=1 \ + -DMDNS_DEBUGMSGS=0 \ -DSO_REUSEADDR \ -DUNICAST_DISABLED |