Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add dnsproxyd_protocol_headers for NETID_USE_LOCAL_NAMESERVERS" into rvc-dev am: 351fb18fa4 am: a5f29fd7ff

Browse Source 
Change-Id: If7e0be35ad58b0d4c6a5436a4d6bdd2c7c490ef6
This commit is contained in:
TreeHugger Robot
2020-05-29 14:19:49 +00:00
committed by Automerger Merge Worker
parent e481191ee7 a5f29fd7ff
commit e0deee66e7
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/jni/Android.bp
View File

@@ -271,7 +271,10 @@ cc_library_shared {
// our headers include libnativewindow's public headers // our headers include libnativewindow's public headers
"libnativewindow", "libnativewindow",
], ],
header_libs: ["bionic_libc_platform_headers"], header_libs: [
"bionic_libc_platform_headers",
"dnsproxyd_protocol_headers",
],
}, },
host: { host: {
cflags: [ cflags: [

5
core/jni/android_net_NetUtils.cpp
View File

@@ -27,12 +27,13 @@
#include <netinet/ip.h> #include <netinet/ip.h>
#include <netinet/udp.h> #include <netinet/udp.h>
#include <DnsProxydProtocol.h> // NETID_USE_LOCAL_NAMESERVERS
#include <android_runtime/AndroidRuntime.h> #include <android_runtime/AndroidRuntime.h>
#include <cutils/properties.h> #include <cutils/properties.h>
#include <utils/misc.h>
#include <utils/Log.h>
#include <nativehelper/JNIHelp.h> #include <nativehelper/JNIHelp.h>
#include <nativehelper/ScopedLocalRef.h> #include <nativehelper/ScopedLocalRef.h>
#include <utils/Log.h>
#include <utils/misc.h>
#include "NetdClient.h" #include "NetdClient.h"
#include "core_jni_helpers.h" #include "core_jni_helpers.h"