From 50caf56267dc512b2f1c95d14f17b07d9d3effe3 Mon Sep 17 00:00:00 2001
From: Lorenzo Colitti <lorenzo@google.com>
Date: Thu, 25 Feb 2021 16:49:46 +0900
Subject: [PATCH] Revert "Revert^2 "Add service-connectivity to tethering
 APEX""

As part of syncing the tethering code from AOSP to mainline-prod,
revert the changes to the build file that added the connectivity
jar and made the module no longer updatable.

The intent is to build and release the tethering module in
mainline-prod, from latest AOSP code, without including the
connectivity code, which depends on S APIs.

This reverts commit 2812f607a0cf9ea18f6b2658d73d2396f6ad95ce.

Bug: 167645754
Test: m com.android.tethering
Ignore-AOSP-First: needed to sync mainline-prod with AOSP
Change-Id: Ic2491f04880ff66abc3b2d3aaee6168e18f6d68a
Merged-In: Ib0ac49609e444a53a6fee4575f5078e15f364eef
---
 Tethering/apex/Android.bp | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/Tethering/apex/Android.bp b/Tethering/apex/Android.bp
index e9deeff42d..6703e460a8 100644
--- a/Tethering/apex/Android.bp
+++ b/Tethering/apex/Android.bp
@@ -20,17 +20,9 @@ package {
 
 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: false,
-    // 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",
         "test.o",