From 2812f607a0cf9ea18f6b2658d73d2396f6ad95ce Mon Sep 17 00:00:00 2001 From: Remi NGUYEN VAN Date: Fri, 8 Jan 2021 01:19:44 +0000 Subject: [PATCH] Revert^2 "Add service-connectivity to tethering APEX" Add the connectivity service JAR to the tethering APEX. This change should not be released in monthly updates until the modularization work is done, so will be reverted in module release branches. This rolls forward the change. The original topic was reverted because of a bad merged-in clause; this is fixed and re-verified in this topic. Test: Boot, wifi connects and has internet access Bug: 171540887 Change-Id: Ib0ac49609e444a53a6fee4575f5078e15f364eef --- Tethering/apex/Android.bp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/Tethering/apex/Android.bp b/Tethering/apex/Android.bp index a1e7fd218d..c99121cae7 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",