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" am: fdcd562529

Browse Source 
Change-Id: I4128678546feba6840ddb210244992846705e5d9
This commit is contained in:
Maciej Żenczykowski
2020-06-01 02:14:25 +00:00
committed by Automerger Merge Worker
parent 5b06ad5252 fdcd562529
commit d8d0f5e5d6
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

@@ -231,7 +231,10 @@ cc_library_shared {
"system/media/private/camera/include", "system/media/private/camera/include",
], ],
header_libs: ["bionic_libc_platform_headers"], header_libs: [
"bionic_libc_platform_headers",
"dnsproxyd_protocol_headers",
],
static_libs: [ static_libs: [
"libasync_safe", "libasync_safe",

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"