commit 1cfc246ff8bee5596f4a74eb8dcc420ca305b613
author android-build-prod (mdb) <android-build-team-robot@google.com> Mon May 21 19:59:37 2018 +0000
committer android-build-prod (mdb) <android-build-team-robot@google.com> Mon May 21 19:59:37 2018 +0000
tree 472ee9502ffd3f3a453ac1adcc425ba1bfb37139
parent d5fcc4381e4bece1447f89707061a6dbccab09f8
parent bbe9a70a8592233a55b6af52a88f1758b9ba8d69

Snap for 4794708 from bbe9a70a8592233a55b6af52a88f1758b9ba8d69 to sdk-release

Change-Id: Ic3c285037b53d83cda56c6c0d08a39d29085a6f8

Android.mk

diff --git a/Android.mk b/Android.mk
index 9d1d8c5..65a3d60 100644
--- a/Android.mk
+++ b/Android.mk
@@ -78,6 +78,8 @@
 LOCAL_CFLAGS += -Wno-unused-parameter
 # Compiler complains about possibly uninitialized variables in rpc-dbus.c.
 LOCAL_CFLAGS += -Wno-maybe-uninitialized
+# Compiler complains about incorrect format placeholders in dhcpcd.c.
+LOCAL_CFLAGS += -Wno-format
 
 LOCAL_SHARED_LIBRARIES += libc libcutils libnetutils
 include $(BUILD_EXECUTABLE)

dhcpcd.c

diff --git a/dhcpcd.c b/dhcpcd.c
index 28a472c..85b50db 100644
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -1447,9 +1447,9 @@
 #endif
 	char ifn[IF_NAMESIZE];
 
-#if defined(__ANDROID__) && !defined(__BRILLO__)
+#if defined(__ANDROID__)
 	switch_user();
-#endif  /* __ANDROID__ && !__BRILLO__ */
+#endif  /* __ANDROID__ */
 
 	/* Test for --help and --version */
 	if (argc > 1) {