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

Commit fc858b70 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 7526140 from 9ae65089 to tm-release 

Change-Id: I5b54b8d09ba4979fc642e1138ed829b52a8ed966
parents 16dfd469 9ae65089

Android.bp

+4 −2
Original line number Diff line number Diff line
@@ -266,7 +266,8 @@ cc_library_static { 
genrule {

    name: "statslog_resolv.h",

    tools: ["stats-log-api-gen"],

    cmd: "$(location stats-log-api-gen) --header $(genDir)/statslog_resolv.h --module resolv --namespace android,net,stats",

    cmd: "$(location stats-log-api-gen) --header $(genDir)/statslog_resolv.h --module resolv" +

         " --namespace android,net,stats --minApiLevel 29",

    out: [

        "statslog_resolv.h",

    ],
@@ -275,7 +276,8 @@ genrule { 
genrule {

    name: "statslog_resolv.cpp",

    tools: ["stats-log-api-gen"],

    cmd: "$(location stats-log-api-gen) --cpp $(genDir)/statslog_resolv.cpp --module resolv --namespace android,net,stats --importHeader statslog_resolv.h --supportQ",

    cmd: "$(location stats-log-api-gen) --cpp $(genDir)/statslog_resolv.cpp --module resolv" +

         " --namespace android,net,stats --importHeader statslog_resolv.h --minApiLevel 29",

    out: [

        "statslog_resolv.cpp",

    ],

tests/resolv_integration_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -6010,7 +6010,7 @@ TEST_F(ResolverTest, MultipleDotQueriesInOnePacket) { 
    threads[1].join();



    // Also check no additional queries due to DoT reconnection.

    EXPECT_EQ(tls.queries(), 2);

    EXPECT_TRUE(tls.waitForQueries(2));

}



TEST_F(ResolverTest, MdnsGetHostByName) {