commit 7d0a4cd13093d88b0ed4c3b450e4f4a226e83b1e
author Anton Hansson <hansson@google.com> Mon May 29 13:59:52 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon May 29 13:59:52 2023 +0000
tree 7d9151866f99e3306b6a99db03fb7276cf250262
parent 9deb915de122e68d267c46be8950799a5549685e
parent 92c28d43a15d87f79cb96e1621d1a28ca02a70a7

Merge "Stop Tethering requiring NetworkStack" am: 92c28d43a1

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

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

Tethering/Android.bp

diff --git a/Tethering/Android.bp b/Tethering/Android.bp
index b88ec7f..23ce1a4 100644
--- a/Tethering/Android.bp
+++ b/Tethering/Android.bp
@@ -195,11 +195,7 @@
     certificate: "networkstack",
     manifest: "AndroidManifest.xml",
     use_embedded_native_libs: true,
-    // The network stack *must* be included to ensure security of the device
-    required: [
-        "NetworkStack",
-        "privapp_allowlist_com.android.tethering",
-    ],
+    required: ["privapp_allowlist_com.android.tethering"],
     apex_available: ["com.android.tethering"],
     lint: { strict_updatability_linting: true },
 }
@@ -215,11 +211,7 @@
     certificate: "networkstack",
     manifest: "AndroidManifest.xml",
     use_embedded_native_libs: true,
-    // The network stack *must* be included to ensure security of the device
-    required: [
-        "NetworkStackNext",
-        "privapp_allowlist_com.android.tethering",
-    ],
+    required: ["privapp_allowlist_com.android.tethering"],
     apex_available: ["com.android.tethering"],
     lint: { strict_updatability_linting: true },
 }