From 9ee2cc8e446f30ddd79be956f6ebf5db0893d9ff Mon Sep 17 00:00:00 2001
From: Remi NGUYEN VAN <reminv@google.com>
Date: Mon, 22 Mar 2021 10:25:12 +0000
Subject: [PATCH] Build service-connectivity with system_server API

As all dependencies on hidden API have been removed, build
service-connectivity against system_server_current.

Bug: 171540887
Test: device boots, has connectivity
Merged-In: I454e8a0a8d0e0f9e6d21a8e8faf5a9e299962ad4
Change-Id: I87ef0968c96272c99c787fdbc21db261acdea6aa
---
 services/net/Android.bp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/services/net/Android.bp b/services/net/Android.bp
index b09a66e324324..292671a43ca7f 100644
--- a/services/net/Android.bp
+++ b/services/net/Android.bp
@@ -83,3 +83,15 @@ filegroup {
         "//packages/modules/Connectivity/Tethering"
     ],
 }
+
+filegroup {
+    name: "services-connectivity-shared-srcs",
+    srcs: [
+        // TODO: move to networkstack-client
+        "java/android/net/IpMemoryStore.java",
+        "java/android/net/NetworkMonitorManager.java",
+        // TODO: move to libs/net
+        "java/android/net/util/KeepalivePacketDataUtil.java",
+        "java/android/net/util/NetworkConstants.java",
+    ],
+}