commit 6f9dbdb13ac2dc46a0c2586a1332615330bb2377
author Frank Li <lifr@google.com> Wed Dec 22 14:30:31 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Dec 22 14:30:31 2021 +0000
tree d860aa8ee3f319b0578b7a97316eac90ba335e03
parent 23404d4aa317131a9718a51d33e7b1bda2c31c34
parent bacbe802c110e516cc07230e199afec5db97eea9

Merge "[DU02]Remove DevicePolicyManagerInternal from NetworkStatsAccess" am: bacbe802c1

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

Change-Id: Iab2c955167d0fb2d02a640c36410f3e3b26f8f73

Tethering/Android.bp

diff --git a/Tethering/Android.bp b/Tethering/Android.bp
index bb435d8..0b54783 100644
--- a/Tethering/Android.bp
+++ b/Tethering/Android.bp
@@ -206,5 +206,4 @@
 sdk {
     name: "tethering-module-sdk",
     bootclasspath_fragments: ["com.android.tethering-bootclasspath-fragment"],
-    systemserverclasspath_fragments: ["com.android.tethering-systemserverclasspath-fragment"],
 }

Tethering/apex/Android.bp

diff --git a/Tethering/apex/Android.bp b/Tethering/apex/Android.bp
index 99fc5d6..7863572 100644
--- a/Tethering/apex/Android.bp
+++ b/Tethering/apex/Android.bp
@@ -44,8 +44,8 @@
     bootclasspath_fragments: [
         "com.android.tethering-bootclasspath-fragment",
     ],
-    systemserverclasspath_fragments: [
-        "com.android.tethering-systemserverclasspath-fragment",
+    java_libs: [
+        "service-connectivity",
     ],
     multilib: {
         first: {
@@ -114,12 +114,6 @@
     },
 }
 
-systemserverclasspath_fragment {
-    name: "com.android.tethering-systemserverclasspath-fragment",
-    standalone_contents: ["service-connectivity"],
-    apex_available: ["com.android.tethering"],
-}
-
 override_apex {
     name: "com.android.tethering.inprocess",
     base: "com.android.tethering",