commit 6c24db946d0e93331fb0a1e28d5b312fa8127f1e
author Jean Chalard <jchalard@google.com> Thu Jan 27 07:36:53 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 27 07:36:53 2022 +0000
tree 6d9baef14891a9433bf1ad88f738448feb9017a5
parent 71c9ca453d12a6b9e7a21c7d5238c2e818fc9a27
parent 96400daaa971316c3eb455d252c67df08a3b7cc1

Merge "Use the network stack shims in services connectivity"

service/Android.bp

diff --git a/service/Android.bp b/service/Android.bp
index d1a9004..3afd635 100644
--- a/service/Android.bp
+++ b/service/Android.bp
@@ -110,6 +110,7 @@
         "networkstack-client",
         "PlatformProperties",
         "service-connectivity-protos",
+        "NetworkStackApiStableShims",
     ],
     apex_available: [
         "com.android.tethering",

service/jarjar-rules.txt

diff --git a/service/jarjar-rules.txt b/service/jarjar-rules.txt
index cc0cbcc..f658a5e 100644
--- a/service/jarjar-rules.txt
+++ b/service/jarjar-rules.txt
@@ -94,5 +94,8 @@
 rule com.android.internal.util.IState* com.android.connectivity.@0
 rule com.android.internal.util.State* com.android.connectivity.@0
 
+# From the API shims
+rule com.android.networkstack.apishim.** com.android.connectivity.@0
+
 # Remaining are connectivity sources in com.android.server and com.android.server.connectivity:
 # TODO: move to a subpackage of com.android.connectivity (such as com.android.connectivity.server)