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
This commit is contained in:
Treehugger Robot
2021-01-07 17:58:14 +00:00
committed by Automerger Merge Worker

View File

@@ -16,17 +16,9 @@
apex { apex {
name: "com.android.tethering", name: "com.android.tethering",
// TODO: make updatable again once this contains only updatable artifacts (in particular, this updatable: true,
// cannot build as updatable unless service-connectivity builds against stable API). min_sdk_version: "30",
// updatable: true, java_libs: ["framework-tethering"],
// min_sdk_version: "30",
java_libs: [
"framework-tethering",
"service-connectivity",
],
jni_libs: [
"libservice-connectivity",
],
bpfs: ["offload.o"], bpfs: ["offload.o"],
apps: ["Tethering"], apps: ["Tethering"],
manifest: "manifest.json", manifest: "manifest.json",