2020-12-21 09:40:08 +00:00
|
|
|
//
|
|
|
|
// 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.
|
|
|
|
//
|
|
|
|
|
2021-02-13 01:07:05 +00:00
|
|
|
package {
|
|
|
|
// See: http://go/android-license-faq
|
2021-05-23 16:38:40 +00:00
|
|
|
default_applicable_licenses: ["Android-Apache-2.0"],
|
2021-02-13 01:07:05 +00:00
|
|
|
}
|
|
|
|
|
2021-10-01 20:22:00 +00:00
|
|
|
aidl_interface {
|
|
|
|
name: "connectivity_native_aidl_interface",
|
|
|
|
local_include_dir: "binder",
|
|
|
|
srcs: [
|
|
|
|
"binder/android/net/connectivity/aidl/*.aidl",
|
|
|
|
],
|
|
|
|
backend: {
|
|
|
|
java: {
|
|
|
|
apex_available: [
|
|
|
|
"com.android.tethering",
|
|
|
|
],
|
|
|
|
min_sdk_version: "30",
|
|
|
|
},
|
|
|
|
ndk: {
|
|
|
|
apex_available: [
|
|
|
|
"com.android.tethering",
|
|
|
|
],
|
|
|
|
min_sdk_version: "30",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
versions: ["1"],
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library_static {
|
|
|
|
name: "connectivity_native_aidl_interface-lateststable-ndk",
|
|
|
|
min_sdk_version: "30",
|
|
|
|
whole_static_libs: [
|
|
|
|
"connectivity_native_aidl_interface-V1-ndk",
|
|
|
|
],
|
|
|
|
apex_available: [
|
|
|
|
"com.android.tethering",
|
|
|
|
],
|
|
|
|
}
|
|
|
|
|
|
|
|
java_library {
|
|
|
|
name: "connectivity_native_aidl_interface-lateststable-java",
|
|
|
|
sdk_version: "system_current",
|
|
|
|
min_sdk_version: "30",
|
|
|
|
static_libs: [
|
|
|
|
"connectivity_native_aidl_interface-V1-java",
|
|
|
|
],
|
|
|
|
apex_available: [
|
|
|
|
"com.android.tethering",
|
|
|
|
],
|
|
|
|
}
|
|
|
|
|
2021-11-11 09:53:56 +00:00
|
|
|
// The library name match the service-connectivity jarjar rules that put the JNI utils in the
|
2022-01-31 02:21:08 +00:00
|
|
|
// android.net.connectivity.com.android.net.module.util package.
|
2021-11-11 09:53:56 +00:00
|
|
|
cc_library_shared {
|
2022-01-31 02:21:08 +00:00
|
|
|
name: "libandroid_net_connectivity_com_android_net_module_util_jni",
|
2021-11-11 09:53:56 +00:00
|
|
|
min_sdk_version: "30",
|
|
|
|
cflags: [
|
|
|
|
"-Wall",
|
|
|
|
"-Werror",
|
|
|
|
"-Wno-unused-parameter",
|
|
|
|
"-Wthread-safety",
|
|
|
|
],
|
|
|
|
srcs: [
|
|
|
|
"jni/com_android_net_module_util/onload.cpp",
|
|
|
|
],
|
|
|
|
static_libs: [
|
|
|
|
"libnet_utils_device_common_bpfjni",
|
2021-10-01 20:22:00 +00:00
|
|
|
"libnet_utils_device_common_bpfutils",
|
2021-11-11 09:53:56 +00:00
|
|
|
],
|
|
|
|
shared_libs: [
|
|
|
|
"liblog",
|
|
|
|
"libnativehelper",
|
|
|
|
],
|
|
|
|
apex_available: [
|
|
|
|
"com.android.tethering",
|
|
|
|
],
|
|
|
|
}
|
|
|
|
|
2021-01-08 01:19:44 +00:00
|
|
|
cc_library_shared {
|
|
|
|
name: "libservice-connectivity",
|
2021-03-23 14:45:58 +00:00
|
|
|
min_sdk_version: "30",
|
2020-12-21 09:40:08 +00:00
|
|
|
cflags: [
|
|
|
|
"-Wall",
|
|
|
|
"-Werror",
|
|
|
|
"-Wno-unused-parameter",
|
|
|
|
"-Wthread-safety",
|
|
|
|
],
|
|
|
|
srcs: [
|
2022-02-02 04:03:29 +00:00
|
|
|
":services.connectivity-netstats-jni-sources",
|
2022-01-28 14:39:17 +00:00
|
|
|
"jni/com_android_server_BpfNetMaps.cpp",
|
2021-12-25 09:05:41 +00:00
|
|
|
"jni/com_android_server_connectivity_ClatCoordinator.cpp",
|
2022-01-28 14:39:17 +00:00
|
|
|
"jni/com_android_server_TestNetworkService.cpp",
|
2021-01-08 01:19:44 +00:00
|
|
|
"jni/onload.cpp",
|
2020-12-21 09:40:08 +00:00
|
|
|
],
|
2021-03-23 14:45:58 +00:00
|
|
|
header_libs: [
|
2022-01-28 14:39:17 +00:00
|
|
|
"bpf_connectivity_headers",
|
2021-03-23 14:45:58 +00:00
|
|
|
],
|
2021-12-25 09:05:41 +00:00
|
|
|
static_libs: [
|
|
|
|
"libclat",
|
|
|
|
"libip_checksum",
|
2022-02-02 04:03:29 +00:00
|
|
|
"libmodules-utils-build",
|
2021-12-25 09:05:41 +00:00
|
|
|
"libnetjniutils",
|
2022-02-02 04:03:29 +00:00
|
|
|
"libnet_utils_device_common_bpfjni",
|
2022-01-28 14:39:17 +00:00
|
|
|
"libtraffic_controller",
|
|
|
|
"netd_aidl_interface-lateststable-ndk",
|
2021-12-25 09:05:41 +00:00
|
|
|
],
|
2020-12-21 09:40:08 +00:00
|
|
|
shared_libs: [
|
2022-02-01 03:59:32 +00:00
|
|
|
"libbase",
|
2022-02-02 04:03:29 +00:00
|
|
|
"libcutils",
|
2022-02-01 03:59:32 +00:00
|
|
|
"libnetdutils",
|
2020-12-21 09:40:08 +00:00
|
|
|
"liblog",
|
|
|
|
"libnativehelper",
|
2022-02-02 04:03:29 +00:00
|
|
|
"libnetworkstats",
|
2020-12-21 09:40:08 +00:00
|
|
|
],
|
|
|
|
apex_available: [
|
2021-01-08 01:19:44 +00:00
|
|
|
"com.android.tethering",
|
2020-12-21 09:40:08 +00:00
|
|
|
],
|
|
|
|
}
|
|
|
|
|
|
|
|
java_library {
|
2021-01-08 10:32:00 +00:00
|
|
|
name: "service-connectivity-pre-jarjar",
|
2021-03-22 10:25:12 +00:00
|
|
|
sdk_version: "system_server_current",
|
2021-03-23 14:45:58 +00:00
|
|
|
min_sdk_version: "30",
|
2023-01-30 10:19:48 +00:00
|
|
|
// NetworkStackApiShimSettingsForCurrentBranch provides the latest available shims depending on
|
|
|
|
// the branch to "service-connectivity".
|
|
|
|
// There are Tethering.apk and TetheringNext.apk variants for the tethering APEX,
|
|
|
|
// which use NetworkStackApiStableShims and NetworkStackApiCurrentShims respectively.
|
|
|
|
// Note that there can be no service-connectivity-next because it would need to be configured in
|
|
|
|
// default_art_config.mk which doesn't support conditionals, hence this scheme of using a
|
|
|
|
// variable here.
|
|
|
|
defaults: ["NetworkStackApiShimSettingsForCurrentBranch"],
|
2020-12-21 09:40:08 +00:00
|
|
|
srcs: [
|
2021-05-13 12:53:15 +00:00
|
|
|
"src/**/*.java",
|
2021-01-08 10:32:00 +00:00
|
|
|
":framework-connectivity-shared-srcs",
|
2021-03-22 10:25:12 +00:00
|
|
|
":services-connectivity-shared-srcs",
|
2022-09-01 01:35:29 +00:00
|
|
|
":statslog-connectivity-java-gen",
|
2020-12-21 09:40:08 +00:00
|
|
|
],
|
|
|
|
libs: [
|
2021-03-22 10:25:12 +00:00
|
|
|
"framework-annotations-lib",
|
2022-11-17 16:13:48 +00:00
|
|
|
"framework-configinfrastructure",
|
2022-01-31 02:21:08 +00:00
|
|
|
"framework-connectivity-pre-jarjar",
|
2022-10-05 17:34:24 +00:00
|
|
|
// The framework-connectivity-t library is only available on T+ platforms
|
|
|
|
// so any calls to it must be protected with a check to ensure that it is
|
|
|
|
// available. The linter will detect any unprotected calls through an API
|
|
|
|
// but not direct calls to the implementation. So, this depends on the
|
|
|
|
// module lib stubs directly to ensure the linter will work correctly
|
|
|
|
// as depending on framework-connectivity-t would cause it to be compiled
|
|
|
|
// against the implementation because the two libraries are in the same
|
|
|
|
// APEX.
|
2022-02-08 13:25:28 +00:00
|
|
|
"framework-connectivity-t.stubs.module_lib",
|
2022-12-14 03:28:32 +00:00
|
|
|
// TODO: figure out why just using "framework-tethering" uses the stubs, even though both
|
|
|
|
// service-connectivity and framework-tethering are in the same APEX.
|
|
|
|
"framework-tethering.impl",
|
2022-10-05 17:34:24 +00:00
|
|
|
"framework-wifi",
|
2020-12-21 09:40:08 +00:00
|
|
|
"unsupportedappusage",
|
2021-03-08 13:05:03 +00:00
|
|
|
"ServiceConnectivityResources",
|
2022-10-05 17:34:24 +00:00
|
|
|
"framework-statsd",
|
2020-12-21 09:40:08 +00:00
|
|
|
],
|
|
|
|
static_libs: [
|
2022-01-31 02:21:08 +00:00
|
|
|
// Do not add libs here if they are already included
|
|
|
|
// in framework-connectivity
|
2022-12-14 03:28:32 +00:00
|
|
|
"androidx.annotation_annotation",
|
2022-06-28 14:47:00 +00:00
|
|
|
"connectivity-net-module-utils-bpf",
|
2021-10-01 20:22:00 +00:00
|
|
|
"connectivity_native_aidl_interface-lateststable-java",
|
2022-12-19 08:33:55 +00:00
|
|
|
"dnsresolver_aidl_interface-V11-java",
|
2021-08-19 10:26:52 +00:00
|
|
|
"modules-utils-shell-command-handler",
|
2020-12-21 09:40:08 +00:00
|
|
|
"net-utils-device-common",
|
2021-11-11 09:53:56 +00:00
|
|
|
"net-utils-device-common-bpf",
|
2022-08-10 02:23:18 +00:00
|
|
|
"net-utils-device-common-ip",
|
2021-07-01 14:00:34 +00:00
|
|
|
"net-utils-device-common-netlink",
|
2022-01-23 16:14:51 +00:00
|
|
|
"net-utils-services-common",
|
2021-01-18 03:58:24 +00:00
|
|
|
"netd-client",
|
2021-03-22 10:25:12 +00:00
|
|
|
"networkstack-client",
|
2021-03-09 09:24:46 +00:00
|
|
|
"PlatformProperties",
|
2021-03-11 06:41:52 +00:00
|
|
|
"service-connectivity-protos",
|
2022-11-25 06:00:54 +00:00
|
|
|
"service-connectivity-stats-protos",
|
2020-12-21 09:40:08 +00:00
|
|
|
],
|
|
|
|
apex_available: [
|
2021-01-08 01:19:44 +00:00
|
|
|
"com.android.tethering",
|
2020-12-21 09:40:08 +00:00
|
|
|
],
|
2021-11-25 06:17:57 +00:00
|
|
|
lint: { strict_updatability_linting: true },
|
2021-12-14 01:30:22 +00:00
|
|
|
visibility: [
|
|
|
|
"//packages/modules/Connectivity/service-t",
|
|
|
|
"//packages/modules/Connectivity/tests:__subpackages__",
|
|
|
|
],
|
2020-12-21 09:40:08 +00:00
|
|
|
}
|
2021-01-08 10:32:00 +00:00
|
|
|
|
2021-03-11 06:41:52 +00:00
|
|
|
java_library {
|
|
|
|
name: "service-connectivity-protos",
|
2021-03-22 10:25:12 +00:00
|
|
|
sdk_version: "system_current",
|
2021-03-23 14:45:58 +00:00
|
|
|
min_sdk_version: "30",
|
2021-03-11 06:41:52 +00:00
|
|
|
proto: {
|
|
|
|
type: "nano",
|
|
|
|
},
|
|
|
|
srcs: [
|
|
|
|
":system-messages-proto-src",
|
|
|
|
],
|
|
|
|
libs: ["libprotobuf-java-nano"],
|
|
|
|
apex_available: [
|
|
|
|
"com.android.tethering",
|
|
|
|
],
|
2022-10-05 17:34:24 +00:00
|
|
|
lint: {
|
|
|
|
strict_updatability_linting: true,
|
|
|
|
},
|
2021-03-11 06:41:52 +00:00
|
|
|
}
|
|
|
|
|
2022-05-20 14:15:42 +00:00
|
|
|
java_defaults {
|
|
|
|
name: "service-connectivity-defaults",
|
2021-03-22 10:25:12 +00:00
|
|
|
sdk_version: "system_server_current",
|
2021-03-23 14:45:58 +00:00
|
|
|
min_sdk_version: "30",
|
2022-09-06 17:58:20 +00:00
|
|
|
defaults: [
|
|
|
|
"standalone-system-server-module-optimize-defaults",
|
|
|
|
],
|
2021-12-14 01:30:22 +00:00
|
|
|
// This library combines system server jars that have access to different bootclasspath jars.
|
|
|
|
// Lower SDK service jars must not depend on higher SDK jars as that would let them
|
|
|
|
// transitively depend on the wrong bootclasspath jars. Sources also cannot be added here as
|
2022-07-25 09:52:58 +00:00
|
|
|
// they would depend on bootclasspath jars that may not be available.
|
2021-03-09 09:24:46 +00:00
|
|
|
static_libs: [
|
2021-01-08 10:32:00 +00:00
|
|
|
"service-connectivity-pre-jarjar",
|
2021-12-14 01:30:22 +00:00
|
|
|
"service-connectivity-tiramisu-pre-jarjar",
|
2022-03-10 04:32:15 +00:00
|
|
|
"service-nearby-pre-jarjar",
|
2021-01-08 10:32:00 +00:00
|
|
|
],
|
2022-07-25 09:52:58 +00:00
|
|
|
// The below libraries are not actually needed to build since no source is compiled
|
|
|
|
// (only combining prebuilt static_libs), but they are necessary so that R8 has the right
|
|
|
|
// references to optimize the code. Without these, there will be missing class warnings and
|
|
|
|
// code may be wrongly optimized.
|
|
|
|
// R8 runs after jarjar, so the framework-X libraries need to be the post-jarjar artifacts
|
|
|
|
// (.impl), if they are not just stubs, so that the name of jarjared classes match.
|
|
|
|
libs: [
|
|
|
|
"androidx.annotation_annotation",
|
|
|
|
"framework-annotations-lib",
|
|
|
|
"framework-connectivity.impl",
|
|
|
|
"framework-connectivity-t.impl",
|
2022-12-14 03:28:32 +00:00
|
|
|
"framework-tethering.impl",
|
2022-10-05 17:34:24 +00:00
|
|
|
"framework-wifi",
|
2022-07-25 09:52:58 +00:00
|
|
|
"libprotobuf-java-nano",
|
|
|
|
],
|
2022-01-31 02:21:08 +00:00
|
|
|
jarjar_rules: ":connectivity-jarjar-rules",
|
2021-01-08 10:32:00 +00:00
|
|
|
apex_available: [
|
|
|
|
"com.android.tethering",
|
|
|
|
],
|
2022-04-20 09:58:53 +00:00
|
|
|
optimize: {
|
|
|
|
proguard_flags_files: ["proguard.flags"],
|
|
|
|
},
|
2022-10-05 17:34:24 +00:00
|
|
|
lint: {
|
|
|
|
strict_updatability_linting: true,
|
|
|
|
},
|
2021-01-08 10:32:00 +00:00
|
|
|
}
|
2021-06-28 09:48:43 +00:00
|
|
|
|
2022-05-20 14:15:42 +00:00
|
|
|
// A special library created strictly for use by the tests as they need the
|
|
|
|
// implementation library but that is not available when building from prebuilts.
|
|
|
|
// Using a library with a different name to what is used by the prebuilts ensures
|
|
|
|
// that this will never depend on the prebuilt.
|
|
|
|
// Switching service-connectivity to a java_sdk_library would also have worked as
|
|
|
|
// that has built in support for managing this but that is too big a change at this
|
|
|
|
// point.
|
|
|
|
java_library {
|
|
|
|
name: "service-connectivity-for-tests",
|
|
|
|
defaults: ["service-connectivity-defaults"],
|
|
|
|
}
|
|
|
|
|
|
|
|
java_library {
|
|
|
|
name: "service-connectivity",
|
|
|
|
defaults: ["service-connectivity-defaults"],
|
|
|
|
installable: true,
|
|
|
|
}
|
|
|
|
|
2022-10-25 18:57:10 +00:00
|
|
|
java_library_static {
|
|
|
|
name: "service-connectivity-stats-protos",
|
|
|
|
sdk_version: "system_current",
|
|
|
|
min_sdk_version: "30",
|
|
|
|
proto: {
|
|
|
|
type: "lite",
|
|
|
|
},
|
|
|
|
srcs: [
|
|
|
|
"src/com/android/metrics/stats.proto",
|
|
|
|
],
|
|
|
|
static_libs: ["ConnectivityServiceprotos"],
|
|
|
|
apex_available: ["com.android.tethering"],
|
|
|
|
}
|
|
|
|
|
Use jarjar rule generator for connectivity rules
(This rolls forward part of a previous change, now that jarjar was fixed
to not get very slow when the number of rules increases).
Autogenerate connectivity jarjar rules at build time, to avoid issues
with forgotten jarjar rules or hard-to-diagnose errors introduced by
incorrect rules.
This change causes all classes in framework-connectivity(-t) and
service-connectivity to be jarjared into android.net.connectivity, but
still avoids jarjaring classes in com.android.server as before, to keep
it small.
For many classes this differs from the original jarjar rule.
Notes on implementation:
- connectivity-jarjar-rules now has a subset
framework-connectivity-jarjar-rules containing only the rules
necessary for framework-connectivity. This is necessary because
framework-connectivity cannot depend on rules generated based on
service-connectivity, as there would be a dependency cycle
(service-connectivity depends on framework-connectivity); Soong even
crashes with a stack overflow.
- framework-wifi.stubs.module_lib is added to
framework-connectivity-pre-jarjar as it is necessary to build it (it
is already in impl_only_libs in the defaults).
It is unclear why framework-connectivity-pre-jarjar could build
before that (possibly because it was only used as "lib" ?)
- Fix package-private visibility; for example NattSocketKeepalive,
TcpSocketKeepalive are not API so should be jarjared, but are used
by ConnectivityManager which is not jarjared, so they are not in the
same package after the change. Package-private members in the
former 2 need to be public to be accessible. Changes in this commit
are all that is needed, as demonstrated by followup commits that move
the classes to a different package without further changes, and that
enforce that no class in an API package gets jarjared.
- framework-connectivity-internal-test-defaults is separated from
framework-connectivity-test-defaults, for unit tests that need to
access internal jarjared classes. Such tests need to use the jarjar
rules themselves too, so this is only appropriate for connectivity
internal unit tests.
Test: atest ConnectivityCoverageTests CtsNetTestCases
Bug: 217129444
Change-Id: Ib1bd939b71c0171d945fc01b96195d2f620ff13b
2022-04-20 06:59:16 +00:00
|
|
|
genrule {
|
2021-06-28 09:48:43 +00:00
|
|
|
name: "connectivity-jarjar-rules",
|
Use jarjar rule generator for connectivity rules
(This rolls forward part of a previous change, now that jarjar was fixed
to not get very slow when the number of rules increases).
Autogenerate connectivity jarjar rules at build time, to avoid issues
with forgotten jarjar rules or hard-to-diagnose errors introduced by
incorrect rules.
This change causes all classes in framework-connectivity(-t) and
service-connectivity to be jarjared into android.net.connectivity, but
still avoids jarjaring classes in com.android.server as before, to keep
it small.
For many classes this differs from the original jarjar rule.
Notes on implementation:
- connectivity-jarjar-rules now has a subset
framework-connectivity-jarjar-rules containing only the rules
necessary for framework-connectivity. This is necessary because
framework-connectivity cannot depend on rules generated based on
service-connectivity, as there would be a dependency cycle
(service-connectivity depends on framework-connectivity); Soong even
crashes with a stack overflow.
- framework-wifi.stubs.module_lib is added to
framework-connectivity-pre-jarjar as it is necessary to build it (it
is already in impl_only_libs in the defaults).
It is unclear why framework-connectivity-pre-jarjar could build
before that (possibly because it was only used as "lib" ?)
- Fix package-private visibility; for example NattSocketKeepalive,
TcpSocketKeepalive are not API so should be jarjared, but are used
by ConnectivityManager which is not jarjared, so they are not in the
same package after the change. Package-private members in the
former 2 need to be public to be accessible. Changes in this commit
are all that is needed, as demonstrated by followup commits that move
the classes to a different package without further changes, and that
enforce that no class in an API package gets jarjared.
- framework-connectivity-internal-test-defaults is separated from
framework-connectivity-test-defaults, for unit tests that need to
access internal jarjared classes. Such tests need to use the jarjar
rules themselves too, so this is only appropriate for connectivity
internal unit tests.
Test: atest ConnectivityCoverageTests CtsNetTestCases
Bug: 217129444
Change-Id: Ib1bd939b71c0171d945fc01b96195d2f620ff13b
2022-04-20 06:59:16 +00:00
|
|
|
defaults: ["jarjar-rules-combine-defaults"],
|
|
|
|
srcs: [
|
|
|
|
":framework-connectivity-jarjar-rules",
|
|
|
|
":service-connectivity-jarjar-gen",
|
|
|
|
":service-nearby-jarjar-gen",
|
|
|
|
],
|
|
|
|
out: ["connectivity-jarjar-rules.txt"],
|
2021-06-28 09:48:43 +00:00
|
|
|
visibility: ["//packages/modules/Connectivity:__subpackages__"],
|
|
|
|
}
|
2022-01-11 17:12:11 +00:00
|
|
|
|
|
|
|
// TODO: This filegroup temporary exposes for NetworkStats. It should be
|
|
|
|
// removed right after NetworkStats moves into mainline module.
|
|
|
|
filegroup {
|
|
|
|
name: "traffic-controller-utils",
|
|
|
|
srcs: ["src/com/android/server/BpfNetMaps.java"],
|
|
|
|
visibility: ["//packages/modules/Connectivity:__subpackages__"],
|
|
|
|
}
|
Use jarjar rule generator for connectivity rules
(This rolls forward part of a previous change, now that jarjar was fixed
to not get very slow when the number of rules increases).
Autogenerate connectivity jarjar rules at build time, to avoid issues
with forgotten jarjar rules or hard-to-diagnose errors introduced by
incorrect rules.
This change causes all classes in framework-connectivity(-t) and
service-connectivity to be jarjared into android.net.connectivity, but
still avoids jarjaring classes in com.android.server as before, to keep
it small.
For many classes this differs from the original jarjar rule.
Notes on implementation:
- connectivity-jarjar-rules now has a subset
framework-connectivity-jarjar-rules containing only the rules
necessary for framework-connectivity. This is necessary because
framework-connectivity cannot depend on rules generated based on
service-connectivity, as there would be a dependency cycle
(service-connectivity depends on framework-connectivity); Soong even
crashes with a stack overflow.
- framework-wifi.stubs.module_lib is added to
framework-connectivity-pre-jarjar as it is necessary to build it (it
is already in impl_only_libs in the defaults).
It is unclear why framework-connectivity-pre-jarjar could build
before that (possibly because it was only used as "lib" ?)
- Fix package-private visibility; for example NattSocketKeepalive,
TcpSocketKeepalive are not API so should be jarjared, but are used
by ConnectivityManager which is not jarjared, so they are not in the
same package after the change. Package-private members in the
former 2 need to be public to be accessible. Changes in this commit
are all that is needed, as demonstrated by followup commits that move
the classes to a different package without further changes, and that
enforce that no class in an API package gets jarjared.
- framework-connectivity-internal-test-defaults is separated from
framework-connectivity-test-defaults, for unit tests that need to
access internal jarjared classes. Such tests need to use the jarjar
rules themselves too, so this is only appropriate for connectivity
internal unit tests.
Test: atest ConnectivityCoverageTests CtsNetTestCases
Bug: 217129444
Change-Id: Ib1bd939b71c0171d945fc01b96195d2f620ff13b
2022-04-20 06:59:16 +00:00
|
|
|
|
|
|
|
java_genrule {
|
|
|
|
name: "service-connectivity-jarjar-gen",
|
|
|
|
tool_files: [
|
|
|
|
":service-connectivity-pre-jarjar{.jar}",
|
|
|
|
":service-connectivity-tiramisu-pre-jarjar{.jar}",
|
|
|
|
"jarjar-excludes.txt",
|
|
|
|
],
|
|
|
|
tools: [
|
|
|
|
"jarjar-rules-generator",
|
|
|
|
],
|
|
|
|
out: ["service_connectivity_jarjar_rules.txt"],
|
|
|
|
cmd: "$(location jarjar-rules-generator) " +
|
2022-08-10 11:15:46 +00:00
|
|
|
"$(location :service-connectivity-pre-jarjar{.jar}) " +
|
Use jarjar rule generator for connectivity rules
(This rolls forward part of a previous change, now that jarjar was fixed
to not get very slow when the number of rules increases).
Autogenerate connectivity jarjar rules at build time, to avoid issues
with forgotten jarjar rules or hard-to-diagnose errors introduced by
incorrect rules.
This change causes all classes in framework-connectivity(-t) and
service-connectivity to be jarjared into android.net.connectivity, but
still avoids jarjaring classes in com.android.server as before, to keep
it small.
For many classes this differs from the original jarjar rule.
Notes on implementation:
- connectivity-jarjar-rules now has a subset
framework-connectivity-jarjar-rules containing only the rules
necessary for framework-connectivity. This is necessary because
framework-connectivity cannot depend on rules generated based on
service-connectivity, as there would be a dependency cycle
(service-connectivity depends on framework-connectivity); Soong even
crashes with a stack overflow.
- framework-wifi.stubs.module_lib is added to
framework-connectivity-pre-jarjar as it is necessary to build it (it
is already in impl_only_libs in the defaults).
It is unclear why framework-connectivity-pre-jarjar could build
before that (possibly because it was only used as "lib" ?)
- Fix package-private visibility; for example NattSocketKeepalive,
TcpSocketKeepalive are not API so should be jarjared, but are used
by ConnectivityManager which is not jarjared, so they are not in the
same package after the change. Package-private members in the
former 2 need to be public to be accessible. Changes in this commit
are all that is needed, as demonstrated by followup commits that move
the classes to a different package without further changes, and that
enforce that no class in an API package gets jarjared.
- framework-connectivity-internal-test-defaults is separated from
framework-connectivity-test-defaults, for unit tests that need to
access internal jarjared classes. Such tests need to use the jarjar
rules themselves too, so this is only appropriate for connectivity
internal unit tests.
Test: atest ConnectivityCoverageTests CtsNetTestCases
Bug: 217129444
Change-Id: Ib1bd939b71c0171d945fc01b96195d2f620ff13b
2022-04-20 06:59:16 +00:00
|
|
|
"$(location :service-connectivity-tiramisu-pre-jarjar{.jar}) " +
|
|
|
|
"--prefix android.net.connectivity " +
|
|
|
|
"--excludes $(location jarjar-excludes.txt) " +
|
|
|
|
"--output $(out)",
|
|
|
|
visibility: ["//visibility:private"],
|
|
|
|
}
|
|
|
|
|
|
|
|
java_genrule {
|
|
|
|
name: "service-nearby-jarjar-gen",
|
|
|
|
tool_files: [
|
|
|
|
":service-nearby-pre-jarjar{.jar}",
|
|
|
|
"jarjar-excludes.txt",
|
|
|
|
],
|
|
|
|
tools: [
|
|
|
|
"jarjar-rules-generator",
|
|
|
|
],
|
|
|
|
out: ["service_nearby_jarjar_rules.txt"],
|
|
|
|
cmd: "$(location jarjar-rules-generator) " +
|
2022-08-10 11:15:46 +00:00
|
|
|
"$(location :service-nearby-pre-jarjar{.jar}) " +
|
Use jarjar rule generator for connectivity rules
(This rolls forward part of a previous change, now that jarjar was fixed
to not get very slow when the number of rules increases).
Autogenerate connectivity jarjar rules at build time, to avoid issues
with forgotten jarjar rules or hard-to-diagnose errors introduced by
incorrect rules.
This change causes all classes in framework-connectivity(-t) and
service-connectivity to be jarjared into android.net.connectivity, but
still avoids jarjaring classes in com.android.server as before, to keep
it small.
For many classes this differs from the original jarjar rule.
Notes on implementation:
- connectivity-jarjar-rules now has a subset
framework-connectivity-jarjar-rules containing only the rules
necessary for framework-connectivity. This is necessary because
framework-connectivity cannot depend on rules generated based on
service-connectivity, as there would be a dependency cycle
(service-connectivity depends on framework-connectivity); Soong even
crashes with a stack overflow.
- framework-wifi.stubs.module_lib is added to
framework-connectivity-pre-jarjar as it is necessary to build it (it
is already in impl_only_libs in the defaults).
It is unclear why framework-connectivity-pre-jarjar could build
before that (possibly because it was only used as "lib" ?)
- Fix package-private visibility; for example NattSocketKeepalive,
TcpSocketKeepalive are not API so should be jarjared, but are used
by ConnectivityManager which is not jarjared, so they are not in the
same package after the change. Package-private members in the
former 2 need to be public to be accessible. Changes in this commit
are all that is needed, as demonstrated by followup commits that move
the classes to a different package without further changes, and that
enforce that no class in an API package gets jarjared.
- framework-connectivity-internal-test-defaults is separated from
framework-connectivity-test-defaults, for unit tests that need to
access internal jarjared classes. Such tests need to use the jarjar
rules themselves too, so this is only appropriate for connectivity
internal unit tests.
Test: atest ConnectivityCoverageTests CtsNetTestCases
Bug: 217129444
Change-Id: Ib1bd939b71c0171d945fc01b96195d2f620ff13b
2022-04-20 06:59:16 +00:00
|
|
|
"--prefix com.android.server.nearby " +
|
|
|
|
"--excludes $(location jarjar-excludes.txt) " +
|
|
|
|
"--output $(out)",
|
|
|
|
visibility: ["//visibility:private"],
|
|
|
|
}
|
2022-09-01 01:35:29 +00:00
|
|
|
|
|
|
|
genrule {
|
2022-10-05 17:34:24 +00:00
|
|
|
name: "statslog-connectivity-java-gen",
|
|
|
|
tools: ["stats-log-api-gen"],
|
|
|
|
cmd: "$(location stats-log-api-gen) --java $(out) --module connectivity --javaPackage com.android.server --javaClass ConnectivityStatsLog",
|
|
|
|
out: ["com/android/server/ConnectivityStatsLog.java"],
|
2022-09-01 01:35:29 +00:00
|
|
|
}
|