joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Make java_sdk_library dependencies explicit" into main

Browse source
This commit is contained in:
Treehugger Robot 2024-09-10 19:12:45 +00:00 • committed by Gerrit Code Review
commit 430a8ad33c
32 changed files with 82 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Tethering/Android.bp
View file

@ -32,16 +32,19 @@ java_defaults {
java_defaults {
name: "TetheringExternalLibs",
defaults: [
"TetheringApiLevel",
],
// Libraries not including Tethering's own framework-tethering (different flavors of that one
// are needed depending on the build rule)
libs: [
"connectivity-internal-api-util",
"framework-configinfrastructure",
"framework-configinfrastructure.stubs.module_lib",
"framework-connectivity.stubs.module_lib",
"framework-connectivity-t.stubs.module_lib",
"framework-statsd.stubs.module_lib",
"framework-wifi",
"framework-bluetooth",
"framework-wifi.stubs.module_lib",
"framework-bluetooth.stubs.module_lib",
"unsupportedappusage",
],
defaults_visibility: ["//visibility:private"],
@ -90,7 +93,6 @@ android_library {
defaults: [
"ConnectivityNextEnableDefaults",
"TetheringAndroidLibraryDefaults",
"TetheringApiLevel",
"TetheringReleaseTargetSdk",
],
static_libs: [
@ -106,7 +108,6 @@ android_library {
name: "TetheringApiStableLib",
defaults: [
"TetheringAndroidLibraryDefaults",
"TetheringApiLevel",
"TetheringReleaseTargetSdk",
],
static_libs: [
@ -195,7 +196,6 @@ android_app {
name: "Tethering",
defaults: [
"TetheringAppDefaults",
"TetheringApiLevel",
],
static_libs: ["TetheringApiStableLib"],
certificate: "networkstack",
@ -209,7 +209,6 @@ android_app {
name: "TetheringNext",
defaults: [
"TetheringAppDefaults",
"TetheringApiLevel",
"ConnectivityNextEnableDefaults",
],
static_libs: ["TetheringApiCurrentLib"],

1
Tethering/common/TetheringLib/Android.bp
View file

@ -29,6 +29,7 @@ java_sdk_library {
"//packages/modules/Connectivity/framework-t",
"//packages/modules/Connectivity/service",
"//packages/modules/Connectivity/service-t",
"//packages/modules/Connectivity/staticlibs",
// Using for test only
"//cts/tests/netlegacy22.api",

6
Tethering/tests/integration/Android.bp
View file

@ -38,9 +38,9 @@ java_defaults {
"connectivity-net-module-utils-bpf",
],
libs: [
"android.test.runner",
"android.test.base",
"android.test.mock",
"android.test.runner.stubs",
"android.test.base.stubs",
"android.test.mock.stubs",
],
}

2
Tethering/tests/mts/Android.bp
View file

@ -26,7 +26,7 @@ android_test {
target_sdk_version: "33",
libs: [
"android.test.base",
"android.test.base.stubs",
],
srcs: [

6
Tethering/tests/unit/Android.bp
View file

@ -62,9 +62,9 @@ java_defaults {
// remove framework-minus-apex, ext, and framework-res
sdk_version: "core_platform",
libs: [
"android.test.runner",
"android.test.base",
"android.test.mock",
"android.test.runner.stubs",
"android.test.base.stubs",
"android.test.mock.stubs",
"ext",
"framework-minus-apex",
"framework-res",

8
framework-t/Android.bp
View file

@ -68,8 +68,8 @@ java_defaults {
impl_only_libs: [
// The build system will use framework-bluetooth module_current stubs, because
// of sdk_version: "module_current" above.
"framework-bluetooth",
"framework-wifi",
"framework-bluetooth.stubs.module_lib",
"framework-wifi.stubs.module_lib",
// Compile against the entire implementation of framework-connectivity,
// including hidden methods. This is safe because if framework-connectivity-t is
// on the bootclasspath (i.e., T), then framework-connectivity is also on the
@ -103,8 +103,8 @@ java_library {
name: "framework-connectivity-t-pre-jarjar",
defaults: ["framework-connectivity-t-defaults"],
libs: [
"framework-bluetooth",
"framework-wifi",
"framework-bluetooth.stubs.module_lib",
"framework-wifi.stubs.module_lib",
"framework-connectivity-pre-jarjar",
"framework-location.stubs.module_lib",
],

2
framework/Android.bp
View file

@ -178,8 +178,10 @@ java_sdk_library {
// In preparation for future move
"//packages/modules/Connectivity/apex",
"//packages/modules/Connectivity/framework-t",
"//packages/modules/Connectivity/remoteauth/service",
"//packages/modules/Connectivity/service",
"//packages/modules/Connectivity/service-t",
"//packages/modules/Connectivity/staticlibs",
"//frameworks/base",
// Tests using hidden APIs

2
nearby/framework/Android.bp
View file

@ -49,7 +49,7 @@ java_library {
libs: [
"androidx.annotation_annotation",
"framework-annotations-lib",
"framework-bluetooth",
"framework-bluetooth.stubs.module_lib",
"framework-location.stubs.module_lib",
],
static_libs: [

6
nearby/service/Android.bp
View file

@ -35,11 +35,11 @@ java_library {
],
libs: [
"androidx.annotation_annotation",
"framework-bluetooth",
"framework-bluetooth.stubs.module_lib",
"error_prone_annotations",
"framework-configinfrastructure",
"framework-configinfrastructure.stubs.module_lib",
"framework-connectivity-t.impl",
"framework-statsd",
"framework-statsd.stubs.module_lib",
],
static_libs: [
"androidx.core_core",

4
nearby/tests/cts/fastpair/Android.bp
View file

@ -30,9 +30,9 @@ android_test {
"truth",
],
libs: [
"android.test.base",
"android.test.base.stubs.system",
"framework-bluetooth.stubs.module_lib",
"framework-configinfrastructure",
"framework-configinfrastructure.stubs.module_lib",
"framework-connectivity-t.impl",
"framework-location.stubs.module_lib",
],

6
nearby/tests/unit/Android.bp
View file

@ -27,9 +27,9 @@ android_test {
srcs: ["src/**/*.java"],
libs: [
"android.test.base",
"android.test.mock",
"android.test.runner",
"android.test.base.stubs.test",
"android.test.mock.stubs.test",
"android.test.runner.stubs.test",
],
compile_multilib: "both",

2
networksecurity/service/Android.bp
View file

@ -27,7 +27,7 @@ java_library {
],
libs: [
"framework-configinfrastructure",
"framework-configinfrastructure.stubs.module_lib",
"framework-connectivity-pre-jarjar",
"service-connectivity-pre-jarjar",
],

6
networksecurity/tests/unit/Android.bp
View file

@ -27,9 +27,9 @@ android_test {
srcs: ["src/**/*.java"],
libs: [
"android.test.base",
"android.test.mock",
"android.test.runner",
"android.test.base.stubs.test",
"android.test.mock.stubs.test",
"android.test.runner.stubs.test",
],
static_libs: [
"androidx.test.ext.junit",

2
remoteauth/framework/Android.bp
View file

@ -47,7 +47,7 @@ java_library {
libs: [
"androidx.annotation_annotation",
"framework-annotations-lib",
"framework-bluetooth",
"framework-bluetooth.stubs.module_lib",
],
static_libs: [
"modules-utils-preconditions",

8
remoteauth/service/Android.bp
View file

@ -33,13 +33,13 @@ java_library {
],
libs: [
"androidx.annotation_annotation",
"framework-bluetooth",
"framework-connectivity",
"framework-bluetooth.stubs.module_lib",
"framework-connectivity.impl",
"error_prone_annotations",
"framework-configinfrastructure",
"framework-configinfrastructure.stubs.module_lib",
"framework-connectivity-pre-jarjar",
"framework-connectivity-t-pre-jarjar",
"framework-statsd",
"framework-statsd.stubs.module_lib",
],
static_libs: [
"modules-utils-build",

6
remoteauth/tests/unit/Android.bp
View file

@ -30,9 +30,9 @@ android_test {
srcs: [],
libs: [
"android.test.base",
"android.test.mock",
"android.test.runner",
"android.test.base.stubs.test",
"android.test.mock.stubs.test",
"android.test.runner.stubs.test",
"framework-annotations-lib",
],
compile_multilib: "both",

4
service-t/Android.bp
View file

@ -51,12 +51,12 @@ java_library {
],
libs: [
"framework-annotations-lib",
"framework-configinfrastructure",
"framework-configinfrastructure.stubs.module_lib",
"framework-connectivity-pre-jarjar",
"framework-connectivity-t-pre-jarjar",
// TODO: use framework-tethering-pre-jarjar when it is separated from framework-tethering
"framework-tethering.impl",
"framework-wifi",
"framework-wifi.stubs.module_lib",
"service-connectivity-pre-jarjar",
"service-nearby-pre-jarjar",
"service-networksecurity-pre-jarjar",

16
service/Android.bp
View file

@ -161,7 +161,7 @@ java_library {
],
libs: [
"framework-annotations-lib",
"framework-configinfrastructure",
"framework-configinfrastructure.stubs.module_lib",
"framework-connectivity-pre-jarjar",
// 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
@ -175,12 +175,12 @@ java_library {
// 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",
"framework-wifi",
"framework-wifi.stubs.module_lib",
"unsupportedappusage",
"ServiceConnectivityResources",
"framework-statsd",
"framework-permission",
"framework-permission-s",
"framework-statsd.stubs.module_lib",
"framework-permission.stubs.module_lib",
"framework-permission-s.stubs.module_lib",
],
static_libs: [
// Do not add libs here if they are already included
@ -264,10 +264,10 @@ java_defaults {
"framework-connectivity.impl",
"framework-connectivity-t.impl",
"framework-tethering.impl",
"framework-wifi",
"framework-wifi.stubs.module_lib",
"libprotobuf-java-nano",
"framework-permission",
"framework-permission-s",
"framework-permission.stubs.module_lib",
"framework-permission-s.stubs.module_lib",
],
jarjar_rules: ":connectivity-jarjar-rules",
apex_available: [

15
staticlibs/Android.bp
View file

@ -70,7 +70,7 @@ java_library {
libs: [
"androidx.annotation_annotation",
"framework-annotations-lib",
"framework-configinfrastructure",
"framework-configinfrastructure.stubs.module_lib",
"framework-connectivity.stubs.module_lib",
],
lint: {
@ -264,7 +264,7 @@ java_library {
],
libs: [
"framework-annotations-lib",
"framework-connectivity",
"framework-connectivity.stubs.module_lib",
],
static_libs: [
"net-utils-device-common",
@ -342,7 +342,7 @@ java_library {
min_sdk_version: "30",
libs: [
"framework-annotations-lib",
"framework-connectivity",
"framework-connectivity.stubs.module_lib",
"modules-utils-build_system",
],
// TODO: remove "apex_available:platform".
@ -468,7 +468,7 @@ java_library {
libs: [
"androidx.annotation_annotation",
"framework-annotations-lib",
"framework-configinfrastructure",
"framework-configinfrastructure.stubs.module_lib",
"framework-connectivity.stubs.module_lib",
],
lint: {
@ -484,12 +484,11 @@ java_defaults {
libs: [
"androidx.annotation_annotation",
"framework-annotations-lib",
"framework-configinfrastructure",
"framework-connectivity",
"framework-configinfrastructure.stubs.module_lib",
"framework-connectivity.stubs.module_lib",
"framework-connectivity-t.stubs.module_lib",
"framework-location.stubs.module_lib",
"framework-tethering",
"framework-tethering.stubs.module_lib",
"unsupportedappusage",
],
static_libs: [
@ -522,6 +521,8 @@ java_library {
],
libs: [
"net-utils-framework-connectivity",
"framework-connectivity.impl",
"framework-tethering.impl",
],
defaults: ["net-utils-non-bootclasspath-defaults"],
jarjar_rules: "jarjar-rules-shared.txt",

4
staticlibs/client-libs/tests/unit/Android.bp
View file

@ -17,8 +17,8 @@ android_library {
"netd-client",
],
libs: [
"android.test.runner",
"android.test.base",
"android.test.runner.stubs.system",
"android.test.base.stubs.system",
],
visibility: [
// Visible for Tethering and NetworkStack integration test and link NetdStaticLibTestsLib

Some files were not shown because too many files have changed in this diff Show more