From 141ec9686cedf40f90900df4465761accbf09d67 Mon Sep 17 00:00:00 2001
From: Luke Huang <huangluke@google.com>
Date: Thu, 28 May 2020 15:41:46 +0800
Subject: [PATCH] Add dnsproxyd_protocol_headers for
 NETID_USE_LOCAL_NAMESERVERS

NETID_USE_LOCAL_NAMESERVERS is no longer in libnetd_client

Bug: 151895202
Test: build
Change-Id: Iea0c2488dcabdd24d6ffca8134cd11ed12e8308a
---
 core/jni/Android.bp               | 5 ++++-
 core/jni/android_net_NetUtils.cpp | 5 +++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/core/jni/Android.bp b/core/jni/Android.bp
index 5a66f4394ead1..0797b18f12dea 100644
--- a/core/jni/Android.bp
+++ b/core/jni/Android.bp
@@ -271,7 +271,10 @@ cc_library_shared {
                 // our headers include libnativewindow's public headers
                 "libnativewindow",
             ],
-            header_libs: ["bionic_libc_platform_headers"],
+            header_libs: [
+                "bionic_libc_platform_headers",
+                "dnsproxyd_protocol_headers",
+            ],
         },
         host: {
             cflags: [
diff --git a/core/jni/android_net_NetUtils.cpp b/core/jni/android_net_NetUtils.cpp
index ba7fe7ff87392..03b9793ccba8b 100644
--- a/core/jni/android_net_NetUtils.cpp
+++ b/core/jni/android_net_NetUtils.cpp
@@ -27,12 +27,13 @@
 #include <netinet/ip.h>
 #include <netinet/udp.h>
 
+#include <DnsProxydProtocol.h> // NETID_USE_LOCAL_NAMESERVERS
 #include <android_runtime/AndroidRuntime.h>
 #include <cutils/properties.h>
-#include <utils/misc.h>
-#include <utils/Log.h>
 #include <nativehelper/JNIHelp.h>
 #include <nativehelper/ScopedLocalRef.h>
+#include <utils/Log.h>
+#include <utils/misc.h>
 
 #include "NetdClient.h"
 #include "core_jni_helpers.h"