Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8d0f5e5 authored by Maciej Żenczykowski's avatar Maciej Żenczykowski Committed by Automerger Merge Worker
Browse files

Merge "Add dnsproxyd_protocol_headers for NETID_USE_LOCAL_NAMESERVERS" am: fdcd5625 

Change-Id: I4128678546feba6840ddb210244992846705e5d9
parents 5b06ad52 fdcd5625

core/jni/Android.bp

+4 −1
Original line number Diff line number Diff line
@@ -231,7 +231,10 @@ cc_library_shared { 
        "system/media/private/camera/include",

    ],



    header_libs: ["bionic_libc_platform_headers"],

    header_libs: [

        "bionic_libc_platform_headers",

        "dnsproxyd_protocol_headers",

    ],



    static_libs: [

        "libasync_safe",

core/jni/android_net_NetUtils.cpp

+3 −2
Original line number Diff line number Diff line
@@ -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"