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
Change-Id: I454e8a0a8d0e0f9e6d21a8e8faf5a9e299962ad4
This commit is contained in:
Remi NGUYEN VAN
2021-03-22 10:25:12 +00:00
parent 6fa238f167
commit f19e30d337

View File

@@ -51,22 +51,33 @@ cc_library_shared {
java_library {
name: "service-connectivity-pre-jarjar",
sdk_version: "system_server_current",
srcs: [
":framework-connectivity-shared-srcs",
":connectivity-service-srcs",
":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",
],
@@ -78,6 +89,7 @@ java_library {
java_library {
name: "service-connectivity-protos",
sdk_version: "system_current",
proto: {
type: "nano",
},
@@ -93,6 +105,7 @@ java_library {
java_library {
name: "service-connectivity",
sdk_version: "system_server_current",
installable: true,
static_libs: [
"service-connectivity-pre-jarjar",