From 4ee6c5071cbf3be2af308319466855ced0ba9404 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.

Original change (project moved):
I454e8a0a8d0e0f9e6d21a8e8faf5a9e299962ad4

Bug: 171540887
Test: device boots, has connectivity
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Change-Id: Ic628e81ed57ab3b41412e7ef97b8a9bf24dd03df
---
 service/Android.bp | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/service/Android.bp b/service/Android.bp
index 8c46dea6f5..ec8887cad4 100644
--- a/service/Android.bp
+++ b/service/Android.bp
@@ -48,22 +48,33 @@ cc_library_shared {
 
 java_library {
     name: "service-connectivity-pre-jarjar",
+    sdk_version: "system_server_current",
     srcs: [
         "src/**/*.java",
         ":framework-connectivity-shared-srcs",
+        ":services-connectivity-shared-srcs",
+        // TODO: move to net-utils-device-common, enable shrink optimization to avoid extra classes
+        ":net-module-utils-srcs",
     ],
     libs: [
-        "android.net.ipsec.ike",
-        "services.core",
-        "services.net",
+        // TODO (b/183097033) remove once system_server_current includes core_current
+        "stable.core.platform.api.stubs",
+        "android_system_server_stubs_current",
+        "framework-annotations-lib",
+        "framework-connectivity.impl",
+        "framework-tethering.stubs.module_lib",
+        "framework-wifi.stubs.module_lib",
         "unsupportedappusage",
         "ServiceConnectivityResources",
     ],
     static_libs: [
+        "dnsresolver_aidl_interface-V7-java",
         "modules-utils-os",
         "net-utils-device-common",
         "net-utils-framework-common",
         "netd-client",
+        "netlink-client",
+        "networkstack-client",
         "PlatformProperties",
         "service-connectivity-protos",
     ],
@@ -75,6 +86,7 @@ java_library {
 
 java_library {
     name: "service-connectivity-protos",
+    sdk_version: "system_current",
     proto: {
         type: "nano",
     },
@@ -90,6 +102,7 @@ java_library {
 
 java_library {
     name: "service-connectivity",
+    sdk_version: "system_server_current",
     installable: true,
     static_libs: [
         "service-connectivity-pre-jarjar",