commit 6a20eeda429406b90219ee3e906aca7b8cb8bca9
author Remi NGUYEN VAN <reminv@google.com> Mon Jan 31 11:21:08 2022 +0900
committer Remi NGUYEN VAN <reminv@google.com> Tue Feb 01 13:33:48 2022 +0900
tree 87e0ed7c3dbb7b324d0b4ad000f8f1e55bd4b70b
parent a2f7b1868035c9e4d6615caf02582a523fc0882d

Reorganize connectivity framework dependencies

Allow framework-connectivity to depend on framework-connectivity-t
stubs, and framework-connectivity-t to depend on prebuilt (to avoid
circular dependencies) framework-connectivity stubs to compile its own
stubs, and framework-connectivity.impl to compile its implementation.

Also reorganize jarjar rules so that service and framework jar can use
static libraries in framework-connectivity without packaging their own,
reducing duplicate code.

Bug: 204830222
Test: m
Change-Id: I75c34986e7c479de23cdb2e9b360fa1fede018c9

Tethering/apex/Android.bp

diff --git a/Tethering/apex/Android.bp b/Tethering/apex/Android.bp
index 721f05e..ea3f8d6 100644
--- a/Tethering/apex/Android.bp
+++ b/Tethering/apex/Android.bp
@@ -52,7 +52,7 @@
         first: {
             jni_libs: [
                 "libservice-connectivity",
-                "libcom_android_connectivity_com_android_net_module_util_jni",
+                "libandroid_net_connectivity_com_android_net_module_util_jni",
             ],
             native_shared_libs: ["libnetd_updatable"],
         },