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

Commit 829511c7 authored by Luke Huang's avatar Luke Huang Committed by Maciej Żenczykowski
Browse files

Stop depend on libnetd_client_header 

Use the new one libnetdbinder_utils  which only included required
header from netd.
Create dnsproxyd_protocol_headers for NETID_USE_LOCAL_NAMESERVERS.

Bug: 151895202
Test: build, atest
Change-Id: I13d56bbce94614865fb0d892b1ce0c6f2fffe4af
Merged-In: I13d56bbce94614865fb0d892b1ce0c6f2fffe4af
parent eb618ef6

Android.bp

+6 −1
Original line number Diff line number Diff line
@@ -10,6 +10,11 @@ cc_library_headers { 
    export_include_dirs: ["."],

}



cc_library_headers {

    name: "dnsproxyd_protocol_headers",

    export_include_dirs: ["include/dnsproxyd_protocol"],

}



aidl_interface {

    name: "dnsresolver_aidl_interface",

    local_include_dir: "binder",
@@ -148,7 +153,7 @@ cc_library { 
        "libssl",

    ],

    header_libs: [

        "libnetd_client_headers",

        "libnetdbinder_utils_headers",

    ],

    runtime_libs: [

        // Causes the linkerconfig to create a namespace link from resolv to the

Dns64Configuration.cpp

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
#include <netdutils/DumpWriter.h>

#include <netdutils/InternetAddresses.h>

#include <netdutils/ThreadUtil.h>

#include <netid_client.h>

#include <thread>

#include <utility>

DnsProxyListener.cpp

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ 
#include <algorithm>

#include <vector>



#include <NetdClient.h>  // NETID_USE_LOCAL_NAMESERVERS

#include <android-base/stringprintf.h>

#include <android/multinetwork.h>  // ResNsendFlags

#include <cutils/misc.h>           // FIRST_APPLICATION_UID
@@ -53,6 +52,7 @@ 
#include "NetdPermissions.h"

#include "PrivateDnsConfiguration.h"

#include "ResolverEventReporter.h"

#include "dnsproxyd_protocol/DnsProxydProtocol.h"  // NETID_USE_LOCAL_NAMESERVERS

#include "getaddrinfo.h"

#include "gethnamaddr.h"

#include "res_send.h"

include/dnsproxyd_protocol/DnsProxydProtocol.h

0 → 100644
+26 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2020 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 *

 */



#pragma once



/*

 * This value should not be changed.

 * It's a flag used in both DnsProxyListener.cpp and NetdClient.cpp

 * to identify if bypassing DoT is available.

 * This flag must be kept in sync with the Network#getNetIdForResolv() usage.

 */

#define NETID_USE_LOCAL_NAMESERVERS 0x80000000

tests/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -153,6 +153,7 @@ cc_test { 
        "resolv_integration_test.cpp",

    ],

    header_libs: [

        "dnsproxyd_protocol_headers",

        "libnetd_resolv_headers",

    ],

    // TODO: make static link libc++ work.