commit 67650555b1ca23f5299950242ad478b340087d5c
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jan 07 17:58:14 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jan 07 17:58:14 2021 +0000
tree 9ce5a773366ceda748d505785b887667a8dd2178
parent 3ebe8d039482bbc70e12b67af24a594af94f4749
parent 4f430ae5ec49dcb846667071be8efe6e2946e160

Merge "Revert "Add service-connectivity to tethering APEX"" am: 4f430ae5ec

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic9c9262fde00878772232e0428688a1b0e285fa9

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",