From 96400daaa971316c3eb455d252c67df08a3b7cc1 Mon Sep 17 00:00:00 2001
From: Chalard Jean <jchalard@google.com>
Date: Wed, 26 Jan 2022 19:09:41 +0900
Subject: [PATCH] Use the network stack shims in services connectivity

Test: m
Change-Id: I8ac4f291cd78720fd3b0d433872881aa98f10d73
---
 service/Android.bp       | 1 +
 service/jarjar-rules.txt | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/service/Android.bp b/service/Android.bp
index d1a9004106..3afd6353d1 100644
--- a/service/Android.bp
+++ b/service/Android.bp
@@ -110,6 +110,7 @@ java_library {
         "networkstack-client",
         "PlatformProperties",
         "service-connectivity-protos",
+        "NetworkStackApiStableShims",
     ],
     apex_available: [
         "com.android.tethering",
diff --git a/service/jarjar-rules.txt b/service/jarjar-rules.txt
index cc0cbcc563..f658a5e18f 100644
--- a/service/jarjar-rules.txt
+++ b/service/jarjar-rules.txt
@@ -94,5 +94,8 @@ rule android.net.util.NetworkConstants* com.android.connectivity.@0
 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)