Merge "Connectivity: bump min sdk 29(Q) to 30(R)" am: 5cee77a0ec

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

Change-Id: I9a1aab79bd4793e3cdf70227855d3fbb6c3248e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Maciej Żenczykowski
2023-06-16 08:59:12 +00:00
committed by Automerger Merge Worker
5 changed files with 7 additions and 7 deletions

View File

@@ -25,7 +25,7 @@ java_library {
"src/com/android/net/module/util/bpf/*.java", "src/com/android/net/module/util/bpf/*.java",
], ],
sdk_version: "module_current", sdk_version: "module_current",
min_sdk_version: "29", min_sdk_version: "30",
visibility: [ visibility: [
// Do not add any lib. This library is only shared inside connectivity module // Do not add any lib. This library is only shared inside connectivity module
// and its tests. // and its tests.

View File

@@ -92,7 +92,7 @@ java_defaults {
"NetworkStackApiStableShims", "NetworkStackApiStableShims",
], ],
jni_uses_sdk_apis: true, 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 // Networking CTS tests that target the latest released SDK. These tests can be installed on release

View File

@@ -31,9 +31,9 @@ cc_defaults {
"liblog", "liblog",
], ],
stl: "libc++_static", 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", sdk_version: "current",
min_sdk_version: "29", min_sdk_version: "30",
} }
cc_library_shared { cc_library_shared {

View File

@@ -28,8 +28,8 @@ cc_defaults {
"libbase", "libbase",
"libnetdutils", "libnetdutils",
], ],
// 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.
min_sdk_version: "29", min_sdk_version: "30",
} }
cc_test { cc_test {

View File

@@ -38,5 +38,5 @@ cc_test {
"bpf_existence_test.cpp", "bpf_existence_test.cpp",
], ],
compile_multilib: "first", 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.
} }