commit 42fb8d0703b29b4e5e248d16ab9be8222e67d901
author Treehugger Robot <treehugger-gerrit@google.com> Wed Dec 22 13:10:21 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 22 13:10:21 2021 +0000
tree 45b04acde583a9548340636392e26e45433d37c7
parent 04bbc5b9b0e97f4c2a2ce2ea1e34f0e98e2f34c7
parent 86c139aedb043ca5a50cd37baeca7309389b51fa

Merge "Dexopt service-connectivity."

Tethering/Android.bp

diff --git a/Tethering/Android.bp b/Tethering/Android.bp
index 0b54783..bb435d8 100644
--- a/Tethering/Android.bp
+++ b/Tethering/Android.bp
@@ -206,4 +206,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 7863572..99fc5d6 100644
--- a/Tethering/apex/Android.bp
+++ b/Tethering/apex/Android.bp
@@ -44,8 +44,8 @@
     bootclasspath_fragments: [
         "com.android.tethering-bootclasspath-fragment",
     ],
-    java_libs: [
-        "service-connectivity",
+    systemserverclasspath_fragments: [
+        "com.android.tethering-systemserverclasspath-fragment",
     ],
     multilib: {
         first: {
@@ -114,6 +114,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",