commit 75e4f62ee1b2c5fa9a3d3022cef789a6cb39cb63
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Feb 08 12:32:18 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 08 12:32:18 2022 +0000
tree e804a9fc9ae4eed2bccc7d91513efc3816b3ad16
parent 36b048973c4557b7ba9872eb9c1cc51cd035e95f
parent 0a9df3b900704625a3a2bf23461e158090a4c664

Merge "Dexopt service-connectivity." into sc-mainline-prod

Tethering/Android.bp

diff --git a/Tethering/Android.bp b/Tethering/Android.bp
index 6d04326..ae96e8c 100644
--- a/Tethering/Android.bp
+++ b/Tethering/Android.bp
@@ -208,4 +208,5 @@
 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 e16e56f..416a7f7 100644
--- a/Tethering/apex/Android.bp
+++ b/Tethering/apex/Android.bp
@@ -45,8 +45,8 @@
     bootclasspath_fragments: [
         "com.android.tethering-bootclasspath-fragment",
     ],
-    java_libs: [
-        "service-connectivity",
+    systemserverclasspath_fragments: [
+        "com.android.tethering-systemserverclasspath-fragment",
     ],
     multilib: {
         first: {
@@ -135,6 +135,12 @@
     },
 }
 
+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",