Merge "Add service-connectivity to tethering APEX"

2021-01-07 08:34:25 +00:00
parent c9c51b665d bd5cc4231d
commit 7998551cdc
1 changed files with 11 additions and 3 deletions
--- 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",