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 "bump min_sdk_version from 29 (Q) to 30 (R)" into main am: a828357fe1 am: 997ff58786

Browse source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2755673

Change-Id: Ie848c66a90ea8d68e4bbc706ebc7fe35c90c8aea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Maciej Żenczykowski 2023-09-20 18:35:24 +00:00 • committed by Automerger Merge Worker
commit 38d888de12
8 changed files with 27 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

16
staticlibs/Android.bp
View file

@ -48,7 +48,7 @@ java_library {
// "src_devicecommon/**/*.kt",
],
sdk_version: "module_current",
min_sdk_version: "29",
min_sdk_version: "30",
target_sdk_version: "30",
apex_available: [
"//apex_available:anyapex",
@ -128,7 +128,7 @@ java_library {
"framework/com/android/net/module/util/HexDump.java",
],
sdk_version: "module_current",
min_sdk_version: "29",
min_sdk_version: "30",
visibility: [
"//packages/modules/Connectivity:__subpackages__",
"//packages/modules/NetworkStack:__subpackages__",
@ -153,7 +153,7 @@ java_library {
"device/com/android/net/module/util/structs/*.java",
],
sdk_version: "module_current",
min_sdk_version: "29",
min_sdk_version: "30",
visibility: [
"//packages/modules/Connectivity:__subpackages__",
"//packages/modules/NetworkStack:__subpackages__",
@ -178,7 +178,7 @@ java_library {
"device/com/android/net/module/util/netlink/*.java",
],
sdk_version: "module_current",
min_sdk_version: "29",
min_sdk_version: "30",
visibility: [
"//packages/modules/Connectivity:__subpackages__",
"//packages/modules/NetworkStack:__subpackages__",
@ -204,7 +204,7 @@ java_library {
"device/com/android/net/module/util/ip/*.java",
],
sdk_version: "module_current",
min_sdk_version: "29",
min_sdk_version: "30",
visibility: [
"//packages/modules/Connectivity:__subpackages__",
"//packages/modules/NetworkStack:__subpackages__",
@ -232,7 +232,7 @@ java_library {
":net-utils-framework-common-srcs",
],
sdk_version: "module_current",
min_sdk_version: "29",
min_sdk_version: "30",
libs: [
"androidx.annotation_annotation",
"framework-annotations-lib",
@ -310,7 +310,7 @@ java_library {
"device/com/android/net/module/util/async/*.java",
],
sdk_version: "module_current",
min_sdk_version: "29",
min_sdk_version: "30",
visibility: [
"//packages/modules/Connectivity:__subpackages__",
],
@ -332,7 +332,7 @@ java_library {
"device/com/android/net/module/util/wear/*.java",
],
sdk_version: "module_current",
min_sdk_version: "29",
min_sdk_version: "30",
visibility: [
"//packages/modules/Connectivity:__subpackages__",
],

2
staticlibs/client-libs/Android.bp
View file

@ -6,7 +6,7 @@ java_library {
name: "netd-client",
srcs: ["netd/**/*"],
sdk_version: "system_current",
min_sdk_version: "29",
min_sdk_version: "30",
apex_available: [
"//apex_available:platform",
"com.android.tethering",

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

@ -8,7 +8,7 @@ android_library {
"src/**/*.java",
"src/**/*.kt",
],
min_sdk_version: "29",
min_sdk_version: "30",
static_libs: [
"androidx.test.rules",
"mockito-target-extended-minus-junit4",

4
staticlibs/native/netjniutils/Android.bp
View file

@ -31,8 +31,8 @@ cc_library_static {
"-Werror",
"-Wno-unused-parameter",
],
sdk_version: "29",
min_sdk_version: "29",
sdk_version: "30",
min_sdk_version: "30",
apex_available: [
"//apex_available:anyapex",
"//apex_available:platform",

22
staticlibs/netd/Android.bp
View file

@ -19,7 +19,7 @@ package {
java_library {
name: "netd_aidl_interface-lateststable-java",
sdk_version: "system_current",
min_sdk_version: "29",
min_sdk_version: "30",
static_libs: [
"netd_aidl_interface-V13-java",
],
@ -38,7 +38,7 @@ cc_library_static {
apex_available: [
"com.android.resolv",
],
min_sdk_version: "29",
min_sdk_version: "30",
}
cc_library_static {
@ -50,7 +50,7 @@ cc_library_static {
"com.android.resolv",
"com.android.tethering",
],
min_sdk_version: "29",
min_sdk_version: "30",
}
cc_defaults {
@ -96,17 +96,17 @@ aidl_interface {
"com.android.tethering",
"com.android.wifi",
],
// this is part of updatable modules(NetworkStack) which targets 29(Q)
min_sdk_version: "29",
// this is part of updatable modules(NetworkStack) which targets 30(R)
min_sdk_version: "30",
},
ndk: {
apex_available: [
"//apex_available:platform",
"com.android.tethering",
],
// This is necessary for the DnsResovler tests to run in Android Q.
// Soong would recognize this value and produce the Q compatible aidl library.
min_sdk_version: "29",
// This is necessary for the DnsResovler tests to run in Android R.
// Soong would recognize this value and produce the R compatible aidl library.
min_sdk_version: "30",
},
},
versions_with_info: [
@ -170,7 +170,7 @@ aidl_interface {
java_library {
name: "netd_event_listener_interface-lateststable-java",
sdk_version: "system_current",
min_sdk_version: "29",
min_sdk_version: "30",
static_libs: [
"netd_event_listener_interface-V1-java",
],
@ -194,7 +194,7 @@ aidl_interface {
"//apex_available:platform",
"com.android.resolv",
],
min_sdk_version: "29",
min_sdk_version: "30",
},
java: {
apex_available: [
@ -202,7 +202,7 @@ aidl_interface {
"com.android.wifi",
"com.android.tethering",
],
min_sdk_version: "29",
min_sdk_version: "30",
},
},
versions_with_info: [

2
staticlibs/netd/libnetdutils/Android.bp
View file

@ -40,7 +40,7 @@ cc_library {
"com.android.resolv",
"com.android.tethering",
],
min_sdk_version: "29",
min_sdk_version: "30",
}
cc_test {

2
staticlibs/tests/unit/Android.bp
View file

@ -9,7 +9,7 @@ package {
android_library {
name: "NetworkStaticLibTestsLib",
srcs: ["src/**/*.java","src/**/*.kt"],
min_sdk_version: "29",
min_sdk_version: "30",
defaults: ["framework-connectivity-test-defaults"],
static_libs: [
"androidx.test.rules",

4
staticlibs/testutils/app/connectivitychecker/Android.bp
View file

@ -20,9 +20,9 @@ android_test_helper_app {
name: "ConnectivityTestPreparer",
srcs: ["src/**/*.kt"],
sdk_version: "system_current",
// Allow running the test on any device with SDK Q+, even when built from a branch that uses
// Allow running the test on any device with SDK R+, even when built from a branch that uses
// an unstable SDK, by targeting a stable SDK regardless of the build SDK.
min_sdk_version: "29",
min_sdk_version: "30",
target_sdk_version: "30",
static_libs: [
"androidx.test.rules",