Merge sc-dev-plus-aosp-without-vendor@7634622

Merged-In: Iab535f4e2c9ba5017e9ee2e112ff20059e7f401b
Change-Id: I26a9deb63a44529dd3f0156c7f92cd8134d0f0b0

9 files changed, 38 insertions, 29 deletions

diff --git a/Android.bp b/Android.bp
index 843daf90..049c5202 100644
--- a/Android.bp
+++ b/Android.bp
@@ -44,6 +44,8 @@ cc_library_headers {
 
 cc_library_headers {
     name: "dnsproxyd_protocol_headers",
+    sdk_version: "29",
+    min_sdk_version: "29",
     export_include_dirs: ["include/dnsproxyd_protocol"],
     apex_available: [
         "//apex_available:platform",
@@ -54,9 +56,9 @@ cc_library_headers {
 dnsresolver_aidl_interface_lateststable_version = "V9"
 
 cc_library_static {
-    name: "dnsresolver_aidl_interface-lateststable-ndk_platform",
+    name: "dnsresolver_aidl_interface-lateststable-ndk",
     whole_static_libs: [
-        "dnsresolver_aidl_interface-" + dnsresolver_aidl_interface_lateststable_version + "-ndk_platform",
+        "dnsresolver_aidl_interface-" + dnsresolver_aidl_interface_lateststable_version + "-ndk",
     ],
     apex_available: [
         "com.android.resolv",
@@ -85,6 +87,7 @@ aidl_interface {
                 "com.android.tethering",
                 "com.android.wifi",
             ],
+            min_sdk_version: "30",
         },
         ndk: {
             gen_log: true,
@@ -189,7 +192,7 @@ cc_library {
     // Link most things statically to minimize our dependence on system ABIs.
     stl: "libc++_static",
     static_libs: [
-        "dnsresolver_aidl_interface-lateststable-ndk_platform",
+        "dnsresolver_aidl_interface-lateststable-ndk",
         "libbase",
         "libcutils",
         "libnetdutils",
@@ -198,7 +201,7 @@ cc_library {
         "libstatslog_resolv",
         "libstatspush_compat",
         "libsysutils",
-        "netd_event_listener_interface-lateststable-ndk_platform",
+        "netd_event_listener_interface-lateststable-ndk",
         "server_configurable_flags",
         "stats_proto",
     ],
diff --git a/TEST_MAPPING b/TEST_MAPPING
index e93ef6a9..87d2b13f 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -8,10 +8,11 @@
         { "name": "resolv_stats_test_utils_test" }
     ],
     "mainline-presubmit": [
-        { "name": "resolv_integration_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]" },
-        { "name": "resolv_gold_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]" },
-        { "name": "resolv_unit_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]" },
-        { "name": "resolv_stress_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]" },
-        { "name": "resolv_stats_test_utils_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]" }
+        // TODO: add back the tethering module when it is updatable in this branch
+        { "name": "resolv_integration_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex]" },
+        { "name": "resolv_gold_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex]" },
+        { "name": "resolv_unit_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex]" },
+        { "name": "resolv_stress_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex]" },
+        { "name": "resolv_stats_test_utils_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex]" }
     ]
 }
diff --git a/apex/manifest.json b/apex/manifest.json
index 533a6be6..9ba3d0a3 100644
--- a/apex/manifest.json
+++ b/apex/manifest.json
@@ -1,4 +1,4 @@
 {
   "name": "com.android.resolv",
-  "version": 309999900
+  "version": 319999900
 }
diff --git a/resolv_test_config_template.xml b/resolv_test_config_template.xml
index 0af8b3b7..63a8cbae 100644
--- a/resolv_test_config_template.xml
+++ b/resolv_test_config_template.xml
@@ -21,6 +21,7 @@
 <configuration description="Configuration for {MODULE} tests">
    <option name="test-suite-tag" value="mts" />
    <option name="config-descriptor:metadata" key="mainline-param" value="CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex" />
+   <option name="config-descriptor:metadata" key="mainline-param" value="CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex" />
    <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>
    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
        <option name="cleanup" value="true" />
diff --git a/tests/Android.bp b/tests/Android.bp
index e1ad86bd..dbbd1b76 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -20,7 +20,7 @@ cc_test_library {
         "libutils",
     ],
     static_libs: [
-        "netd_aidl_interface-lateststable-ndk_platform",
+        "netd_aidl_interface-lateststable-ndk",
         "libnetd_test_dnsresponder_ndk",
         "libnetdutils",
         "libgmock",
@@ -100,7 +100,7 @@ cc_test {
         "libbinder_ndk",
     ],
     static_libs: [
-        "dnsresolver_aidl_interface-lateststable-ndk_platform",
+        "dnsresolver_aidl_interface-lateststable-ndk",
         "golddata_proto",
         "libcrypto_static",
         "libdoh_ffi_for_test",
@@ -111,8 +111,8 @@ cc_test {
         "libnetdutils",
         "libprotobuf-cpp-lite",
         "libssl",
-        "netd_aidl_interface-lateststable-ndk_platform",
-        "netd_event_listener_interface-lateststable-ndk_platform",
+        "netd_aidl_interface-lateststable-ndk",
+        "netd_event_listener_interface-lateststable-ndk",
         "server_configurable_flags",
         "stats_proto",
     ],
@@ -139,14 +139,14 @@ cc_test {
         "libnetd_client",
     ],
     static_libs: [
-        "dnsresolver_aidl_interface-lateststable-ndk_platform",
+        "dnsresolver_aidl_interface-lateststable-ndk",
         "libgmock",
         "libnetd_test_dnsresponder_ndk",
         "libnetd_test_resolv_utils",
         "libnetdutils",
         "libutils",
-        "netd_event_listener_interface-lateststable-ndk_platform",
-        "netd_aidl_interface-lateststable-ndk_platform",
+        "netd_event_listener_interface-lateststable-ndk",
+        "netd_aidl_interface-lateststable-ndk",
     ],
 }
 
@@ -176,7 +176,7 @@ cc_test {
         "libnetd_client",
     ],
     static_libs: [
-        "dnsresolver_aidl_interface-lateststable-ndk_platform",
+        "dnsresolver_aidl_interface-lateststable-ndk",
         "libbpf_android",
         "libcrypto_static",
         "libgmock",
@@ -186,8 +186,8 @@ cc_test {
         "libnetdutils",
         "libssl",
         "libutils",
-        "netd_aidl_interface-lateststable-ndk_platform",
-        "netd_event_listener_interface-lateststable-ndk_platform",
+        "netd_aidl_interface-lateststable-ndk",
+        "netd_event_listener_interface-lateststable-ndk",
         "libipchecksum",
         "resolv_unsolicited_listener",
         "libdoh_frontend_ffi",
@@ -231,9 +231,9 @@ cc_test {
         "libbinder_ndk",
     ],
     static_libs: [
-        "dnsresolver_aidl_interface-lateststable-ndk_platform",
-        "netd_aidl_interface-lateststable-ndk_platform",
-        "netd_event_listener_interface-lateststable-ndk_platform",
+        "dnsresolver_aidl_interface-lateststable-ndk",
+        "netd_aidl_interface-lateststable-ndk",
+        "netd_event_listener_interface-lateststable-ndk",
         "libcrypto_static",
         "libcutils",
         "libdoh_ffi_for_test",
@@ -276,7 +276,10 @@ cc_test {
     ],
     defaults: ["netd_defaults", "resolv_test_defaults"],
     test_suites: ["general-tests"],
-    test_mainline_modules: ["CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex"],
+    test_mainline_modules: [
+        "CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex",
+        "CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex"
+    ],
     static_libs: [
         "libgmock",
         "libprotobuf-cpp-lite",
diff --git a/tests/dns_metrics_listener/Android.bp b/tests/dns_metrics_listener/Android.bp
index 7dcd529b..7ec39fa0 100644
--- a/tests/dns_metrics_listener/Android.bp
+++ b/tests/dns_metrics_listener/Android.bp
@@ -20,6 +20,6 @@ cc_test_library {
     ],
     static_libs: [
         "libutils",
-        "netd_event_listener_interface-lateststable-ndk_platform",
+        "netd_event_listener_interface-lateststable-ndk",
     ],
 }
diff --git a/tests/dns_responder/Android.bp b/tests/dns_responder/Android.bp
index 99d44489..f69db964 100644
--- a/tests/dns_responder/Android.bp
+++ b/tests/dns_responder/Android.bp
@@ -22,12 +22,12 @@ cc_test_library {
         "libnetd_resolv_internal_headers",
     ],
     static_libs: [
-        "dnsresolver_aidl_interface-lateststable-ndk_platform",
+        "dnsresolver_aidl_interface-lateststable-ndk",
         "libcrypto_static",
         "libnetdutils",
         "libssl",
-        "netd_aidl_interface-lateststable-ndk_platform",
-        "netd_event_listener_interface-lateststable-ndk_platform",
+        "netd_aidl_interface-lateststable-ndk",
+        "netd_event_listener_interface-lateststable-ndk",
     ],
     srcs: [
         "dns_responder.cpp",
diff --git a/tests/resolv_gold_test_config.xml b/tests/resolv_gold_test_config.xml
index 8b7f8dd7..ceddd807 100644
--- a/tests/resolv_gold_test_config.xml
+++ b/tests/resolv_gold_test_config.xml
@@ -16,6 +16,7 @@
 <configuration description="Configuration for resolv gold tests">
    <option name="test-suite-tag" value="mts" />
    <option name="config-descriptor:metadata" key="mainline-param" value="CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex" />
+   <option name="config-descriptor:metadata" key="mainline-param" value="CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex" />
    <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>
    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
        <option name="cleanup" value="true" />
diff --git a/tests/unsolicited_listener/Android.bp b/tests/unsolicited_listener/Android.bp
index 0c2f4fe2..dc465c7c 100644
--- a/tests/unsolicited_listener/Android.bp
+++ b/tests/unsolicited_listener/Android.bp
@@ -17,7 +17,7 @@ cc_test_library {
         "libbinder_ndk",
     ],
     static_libs: [
-        "dnsresolver_aidl_interface-lateststable-ndk_platform",
+        "dnsresolver_aidl_interface-lateststable-ndk",
         "libutils",
     ],
 }