commit 822ef077c6f6f6bb9ee09e69153df0ea62deaaac
author Remi NGUYEN VAN <reminv@google.com> Tue Jan 12 03:42:16 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jan 12 03:42:16 2021 +0000
tree c77cf7615d520dcdd0d97e9304e6c8db64e506d0
parent cb561f4183384641244e05f61109d2a980de5f79
parent a8208c50f8cb11f8cd335574678783056bc44319

Merge "Revert^2 "Add service-connectivity to tethering APEX"" am: 73fa31b404 am: f3b8223844 am: a8208c50f8

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie4424773b4547c6f09a99024da94aefedd696552

Tethering/apex/Android.bp

diff --git a/Tethering/apex/Android.bp b/Tethering/apex/Android.bp
index a1e7fd2..c99121c 100644
--- a/Tethering/apex/Android.bp
+++ b/Tethering/apex/Android.bp
@@ -16,9 +16,17 @@
 
 apex {
     name: "com.android.tethering",
-    updatable: true,
-    min_sdk_version: "30",
-    java_libs: ["framework-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",
+    ],
     bpfs: ["offload.o"],
     apps: ["Tethering"],
     manifest: "manifest.json",