commit 8dc93f5fef4e55449989f29170bf119d9e8b6ed1
author android-build-team Robot <android-build-team-robot@google.com> Fri Sep 01 09:31:56 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri Sep 01 09:31:56 2017 +0000
tree 99d0b6901893778f468cfbcd21a3351713eedc90
parent d8679a9950426f07dd1dac961814cf21f48c90b3
parent 3bee30503479f1e344c3531db7ccf5640f331a24

Merge cherrypicks of [2835144, 2835145] into oc-r6-release

Change-Id: I6e7b3c4fe6031b93a162e5569ae92a54802b64a5

Android.mk

diff --git a/Android.mk b/Android.mk
index 21143a3..0ef962c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -10,6 +10,7 @@
 commonFlags := \
     -O2 -g \
     -fno-strict-aliasing \
+    -fwrapv \
     -D_GNU_SOURCE \
     -DHAVE_IPV6 \
     -DNOT_HAVE_SA_LEN \
@@ -20,6 +21,7 @@
     -W \
     -Wall \
     -Wextra \
+    -Wno-address-of-packed-member \
     -Wno-array-bounds \
     -Wno-pointer-sign \
     -Wno-unused \

mDNSCore/mDNS.c

diff --git a/mDNSCore/mDNS.c b/mDNSCore/mDNS.c
index ddee3de..e126754 100755
--- a/mDNSCore/mDNS.c
+++ b/mDNSCore/mDNS.c
@@ -10641,7 +10641,7 @@
 	// Task Scheduling variables
 	result = mDNSPlatformTimeInit();
 	if (result != mStatus_NoError) return(result);
-	m->timenow_adjust = 0;            // b/63335997 , High outbound network traffic
+	m->timenow_adjust = (mDNSs32)mDNSRandom(0xFFFFFFFF);
 	timenow = mDNS_TimeNow_NoLock(m);
 
 	m->timenow                 = 0;		// MUST only be set within mDNS_Lock/mDNS_Unlock section