1 files changed, 69 insertions, 22 deletions

diff --git a/Android.bp b/Android.bp
index ef988163..4047527d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -53,7 +53,7 @@ cc_library_headers {
     ],
 }
 
-dnsresolver_aidl_interface_lateststable_version = "V11"
+dnsresolver_aidl_interface_lateststable_version = "V13"
 
 cc_library_static {
     name: "dnsresolver_aidl_interface-lateststable-ndk",
@@ -96,22 +96,67 @@ aidl_interface {
             min_sdk_version: "30",
         },
     },
-    versions: [
-        "1",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6",
-        "7",
-        "8",
-        "9",
-        "10",
-        "11",
-    ],
+
     dumpapi: {
         no_license: true,
     },
+    versions_with_info: [
+        {
+            version: "1",
+            imports: ["netd_event_listener_interface-V1"],
+        },
+        {
+            version: "2",
+            imports: ["netd_event_listener_interface-V1"],
+        },
+        {
+            version: "3",
+            imports: ["netd_event_listener_interface-V1"],
+        },
+        {
+            version: "4",
+            imports: ["netd_event_listener_interface-V1"],
+        },
+        {
+            version: "5",
+            imports: ["netd_event_listener_interface-V1"],
+        },
+        {
+            version: "6",
+            imports: ["netd_event_listener_interface-V1"],
+        },
+        {
+            version: "7",
+            imports: ["netd_event_listener_interface-V1"],
+        },
+        {
+            version: "8",
+            imports: ["netd_event_listener_interface-V1"],
+        },
+        {
+            version: "9",
+            imports: ["netd_event_listener_interface-V1"],
+        },
+        {
+            version: "10",
+            imports: ["netd_event_listener_interface-V1"],
+        },
+        {
+            version: "11",
+            imports: ["netd_event_listener_interface-V1"],
+        },
+        {
+            version: "12",
+            imports: ["netd_event_listener_interface-V1"],
+        },
+        {
+            version: "13",
+            imports: ["netd_event_listener_interface-V1"],
+        },
+
+    ],
+    frozen: true,
+
 }
 
 cc_defaults {
@@ -154,7 +199,7 @@ cc_defaults {
     // after the build process.
     host_required: [
         "net-tests-utils-host-common",
-    ]
+    ],
 }
 
 cc_defaults {
@@ -176,7 +221,7 @@ cc_defaults {
     // after the build process.
     host_required: [
         "net-tests-utils-host-common",
-    ]
+    ],
 }
 
 cc_library {
@@ -229,8 +274,8 @@ cc_library {
         "libmodules-utils-build",
         "libprotobuf-cpp-lite",
         "libstatslog_resolv",
-        "libstatspush_compat",
         "libsysutils",
+        "libutils",
         "netd_event_listener_interface-lateststable-ndk",
         "server_configurable_flags",
         "stats_proto",
@@ -251,6 +296,9 @@ cc_library {
         "libssl",
         "libstatssocket",
     ],
+    runtime_libs: [
+        "libcom.android.tethering.dns_helper",
+    ],
     header_libs: [
         "libnetdbinder_utils_headers",
     ],
@@ -292,7 +340,7 @@ 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 --minApiLevel 29",
+        " --namespace android,net,stats --minApiLevel 30",
     out: [
         "statslog_resolv.h",
     ],
@@ -302,7 +350,7 @@ 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 --minApiLevel 29",
+        " --namespace android,net,stats --importHeader statslog_resolv.h --minApiLevel 30",
     out: [
         "statslog_resolv.cpp",
     ],
@@ -316,10 +364,9 @@ cc_library_static {
     export_generated_headers: ["statslog_resolv.h"],
     static_libs: [
         "libcutils",
-        "libstatspush_compat",
     ],
-    header_libs: [
-        "libgtest_prod_headers", // Used by libstatspush_compat
+    shared_libs: [
+        "libstatssocket",
     ],
     apex_available: ["com.android.resolv"],
     min_sdk_version: "30",