commit 2c7b692068fbde605ae1f2e0915eecfd53e0e47c
author Lorenzo Colitti <lorenzo@google.com> Fri Apr 01 22:15:12 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Apr 01 22:15:12 2022 +0000
tree 0757715c892f88a0861a4fbd9490e34cd18b150a
parent 0928dbc31bd4f39f06c4ba75985d127494c00fd9
parent 6de87582c13a57e1b0cc9cfc7c12335e1e7d5238

Merge changes from topic "block_port" am: 6de87582c1

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2008366

Change-Id: I81bf3d454b2f7919105a9945aa7bc2971ffd805f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

TEST_MAPPING

diff --git a/TEST_MAPPING b/TEST_MAPPING
index a5b97a1..b720c0b 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -22,6 +22,9 @@
       "name": "bpf_existence_test"
     },
     {
+      "name": "connectivity_native_test"
+    },
+    {
       "name": "netd_updatable_unit_test"
     },
     {
@@ -78,6 +81,9 @@
       "name": "bpf_existence_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]"
     },
     {
+      "name": "connectivity_native_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]"
+    },
+    {
       "name": "netd_updatable_unit_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]"
     },
     {