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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I15564a42939ccdc54954e4d130b6236bde94864b
This commit is contained in:
Remi NGUYEN VAN
2021-01-12 02:05:58 +00:00
committed by Automerger Merge Worker

View File

@@ -16,9 +16,17 @@
apex { apex {
name: "com.android.tethering", name: "com.android.tethering",
updatable: true, // TODO: make updatable again once this contains only updatable artifacts (in particular, this
min_sdk_version: "30", // cannot build as updatable unless service-connectivity builds against stable API).
java_libs: ["framework-tethering"], // updatable: true,
// 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",