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

Commit f9883456 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add dnsproxyd_protocol_headers for NETID_USE_LOCAL_NAMESERVERS" into... 

Merge "Add dnsproxyd_protocol_headers for NETID_USE_LOCAL_NAMESERVERS" into rvc-dev am: 351fb18f am: a5f29fd7

Change-Id: Id41b48d677a1a3e028c7b0537f302ac8b297c131
parents fa749869 a5f29fd7

core/jni/Android.bp

+4 −1
Original line number Original line Diff line number Diff line
@@ -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: [

core/jni/android_net_NetUtils.cpp

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