commit 4f430ae5ec49dcb846667071be8efe6e2946e160
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jan 07 15:25:03 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 07 15:25:03 2021 +0000
tree 9ce5a773366ceda748d505785b887667a8dd2178
parent 7998551cdc440aa7b5227fa6eb3d27f3a1605c93
parent 850ca6f6b421b98f0aabeec6f1ca8dba4acebc1d

Merge "Revert "Add service-connectivity to tethering APEX""

Tethering/apex/Android.bp

diff --git a/Tethering/apex/Android.bp b/Tethering/apex/Android.bp
index c99121c..a1e7fd2 100644
--- a/Tethering/apex/Android.bp
+++ b/Tethering/apex/Android.bp
@@ -16,17 +16,9 @@
 
 apex {
     name: "com.android.tethering",
-    // TODO: make updatable again once this contains only updatable artifacts (in particular, this
-    // cannot build as updatable unless service-connectivity builds against stable API).
-    // updatable: true,
-    // min_sdk_version: "30",
-    java_libs: [
-        "framework-tethering",
-        "service-connectivity",
-    ],
-    jni_libs: [
-        "libservice-connectivity",
-    ],
+    updatable: true,
+    min_sdk_version: "30",
+    java_libs: ["framework-tethering"],
     bpfs: ["offload.o"],
     apps: ["Tethering"],
     manifest: "manifest.json",