Merge "Connectivity: bump min sdk 29(Q) to 30(R)"
This commit is contained in:
@@ -25,7 +25,7 @@ java_library {
|
||||
"src/com/android/net/module/util/bpf/*.java",
|
||||
],
|
||||
sdk_version: "module_current",
|
||||
min_sdk_version: "29",
|
||||
min_sdk_version: "30",
|
||||
visibility: [
|
||||
// Do not add any lib. This library is only shared inside connectivity module
|
||||
// and its tests.
|
||||
|
||||
@@ -92,7 +92,7 @@ java_defaults {
|
||||
"NetworkStackApiStableShims",
|
||||
],
|
||||
jni_uses_sdk_apis: true,
|
||||
min_sdk_version: "29",
|
||||
min_sdk_version: "30",
|
||||
}
|
||||
|
||||
// Networking CTS tests that target the latest released SDK. These tests can be installed on release
|
||||
|
||||
@@ -31,9 +31,9 @@ cc_defaults {
|
||||
"liblog",
|
||||
],
|
||||
stl: "libc++_static",
|
||||
// To be compatible with Q devices, the min_sdk_version must be 29.
|
||||
// To be compatible with R devices, the min_sdk_version must be 30.
|
||||
sdk_version: "current",
|
||||
min_sdk_version: "29",
|
||||
min_sdk_version: "30",
|
||||
}
|
||||
|
||||
cc_library_shared {
|
||||
|
||||
@@ -28,8 +28,8 @@ cc_defaults {
|
||||
"libbase",
|
||||
"libnetdutils",
|
||||
],
|
||||
// To be compatible with Q devices, the min_sdk_version must be 29.
|
||||
min_sdk_version: "29",
|
||||
// To be compatible with R devices, the min_sdk_version must be 30.
|
||||
min_sdk_version: "30",
|
||||
}
|
||||
|
||||
cc_test {
|
||||
|
||||
@@ -38,5 +38,5 @@ cc_test {
|
||||
"bpf_existence_test.cpp",
|
||||
],
|
||||
compile_multilib: "first",
|
||||
min_sdk_version: "29", // Ensure test runs on Q and above.
|
||||
min_sdk_version: "30", // Ensure test runs on R and above.
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user