From 850ca6f6b421b98f0aabeec6f1ca8dba4acebc1d Mon Sep 17 00:00:00 2001 From: Pete Bentley Date: Thu, 7 Jan 2021 13:51:18 +0000 Subject: [PATCH] Revert "Add service-connectivity to tethering APEX" Revert "Set setCurrentProxyScriptUrl as public" Revert submission 1532910-connectivity_jar_in_apex Reason for revert: Breaks boot tests: b/176969905 Reverted Changes: Ie41a5b569:Set setCurrentProxyScriptUrl as public Id7b6a4664:Move service-connectivity to the tethering APEX Ia7cb83834:Add service-connectivity to tethering APEX Change-Id: I9f31d4810a92e620f02cc8d24bdf18fe28001a2b --- 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 c99121cae7..a1e7fd218d 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",