b2e919f9da
Core platform API stubs are now correctly included in module_current and system_server_current, so workarounds used to use such APIs can be removed. OsCompat and InetAddressCompat were only necessary because manually adding the stubs did not resolve the problem for classes that had public API stubs, which shadowed the module API stubs. The manual stubs dependency was already removed in another change. Also remove the service jar dependency on android_system_server_stubs_current as it is already included in sdk_version system_server_current. Bug: 183097033 Test: atest CtsNetTestCases Change-Id: Id448be03b679f832edb24f1b77f471227faf5268
118 lines
3.0 KiB
Plaintext
118 lines
3.0 KiB
Plaintext
//
|
|
// Copyright (C) 2020 The Android Open Source Project
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
//
|
|
|
|
package {
|
|
// See: http://go/android-license-faq
|
|
default_applicable_licenses: ["Android-Apache-2.0"],
|
|
}
|
|
|
|
cc_library_shared {
|
|
name: "libservice-connectivity",
|
|
min_sdk_version: "30",
|
|
cflags: [
|
|
"-Wall",
|
|
"-Werror",
|
|
"-Wno-unused-parameter",
|
|
"-Wthread-safety",
|
|
],
|
|
srcs: [
|
|
"jni/com_android_server_TestNetworkService.cpp",
|
|
"jni/onload.cpp",
|
|
],
|
|
stl: "libc++_static",
|
|
header_libs: [
|
|
"libbase_headers",
|
|
],
|
|
shared_libs: [
|
|
"liblog",
|
|
"libnativehelper",
|
|
],
|
|
apex_available: [
|
|
"com.android.tethering",
|
|
],
|
|
}
|
|
|
|
java_library {
|
|
name: "service-connectivity-pre-jarjar",
|
|
sdk_version: "system_server_current",
|
|
min_sdk_version: "30",
|
|
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: [
|
|
"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",
|
|
],
|
|
apex_available: [
|
|
"com.android.tethering",
|
|
],
|
|
}
|
|
|
|
java_library {
|
|
name: "service-connectivity-protos",
|
|
sdk_version: "system_current",
|
|
min_sdk_version: "30",
|
|
proto: {
|
|
type: "nano",
|
|
},
|
|
srcs: [
|
|
":system-messages-proto-src",
|
|
],
|
|
libs: ["libprotobuf-java-nano"],
|
|
apex_available: [
|
|
"com.android.tethering",
|
|
],
|
|
}
|
|
|
|
java_library {
|
|
name: "service-connectivity",
|
|
sdk_version: "system_server_current",
|
|
min_sdk_version: "30",
|
|
installable: true,
|
|
static_libs: [
|
|
"service-connectivity-pre-jarjar",
|
|
],
|
|
jarjar_rules: "jarjar-rules.txt",
|
|
apex_available: [
|
|
"com.android.tethering",
|
|
],
|
|
}
|
|
|
|
filegroup {
|
|
name: "connectivity-jarjar-rules",
|
|
srcs: ["jarjar-rules.txt"],
|
|
visibility: ["//packages/modules/Connectivity:__subpackages__"],
|
|
}
|