From 127a1441c395f82caeb2d194476385eeb72fc315 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= Date: Tue, 19 Sep 2023 23:17:10 +0000 Subject: [PATCH] bump min_sdk_version from 29 (Q) to 30 (R) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Mainline no longer supports Q. These files were recently moved into p/m/C as part of a refactor. Test: TreeHugger Signed-off-by: Maciej Żenczykowski Change-Id: I0f06ace921db6c79d63c0048bdb73d167ff606cf --- staticlibs/Android.bp | 16 +++++++------- staticlibs/client-libs/Android.bp | 2 +- staticlibs/client-libs/tests/unit/Android.bp | 2 +- staticlibs/native/netjniutils/Android.bp | 4 ++-- staticlibs/netd/Android.bp | 22 +++++++++---------- staticlibs/netd/libnetdutils/Android.bp | 2 +- staticlibs/tests/unit/Android.bp | 2 +- .../app/connectivitychecker/Android.bp | 4 ++-- 8 files changed, 27 insertions(+), 27 deletions(-) diff --git a/staticlibs/Android.bp b/staticlibs/Android.bp index ee79ef2b12..59a63f2545 100644 --- a/staticlibs/Android.bp +++ b/staticlibs/Android.bp @@ -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__", ], diff --git a/staticlibs/client-libs/Android.bp b/staticlibs/client-libs/Android.bp index c5600453c8..c938dd613d 100644 --- a/staticlibs/client-libs/Android.bp +++ b/staticlibs/client-libs/Android.bp @@ -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", diff --git a/staticlibs/client-libs/tests/unit/Android.bp b/staticlibs/client-libs/tests/unit/Android.bp index 220a6c1904..03e3e70054 100644 --- a/staticlibs/client-libs/tests/unit/Android.bp +++ b/staticlibs/client-libs/tests/unit/Android.bp @@ -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", diff --git a/staticlibs/native/netjniutils/Android.bp b/staticlibs/native/netjniutils/Android.bp index 22fd1fa400..ca3bbbc0a1 100644 --- a/staticlibs/native/netjniutils/Android.bp +++ b/staticlibs/native/netjniutils/Android.bp @@ -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", diff --git a/staticlibs/netd/Android.bp b/staticlibs/netd/Android.bp index d135a1c89a..65b3b0979e 100644 --- a/staticlibs/netd/Android.bp +++ b/staticlibs/netd/Android.bp @@ -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: [ diff --git a/staticlibs/netd/libnetdutils/Android.bp b/staticlibs/netd/libnetdutils/Android.bp index 31690331cc..fdb9380d4f 100644 --- a/staticlibs/netd/libnetdutils/Android.bp +++ b/staticlibs/netd/libnetdutils/Android.bp @@ -40,7 +40,7 @@ cc_library { "com.android.resolv", "com.android.tethering", ], - min_sdk_version: "29", + min_sdk_version: "30", } cc_test { diff --git a/staticlibs/tests/unit/Android.bp b/staticlibs/tests/unit/Android.bp index 40371e63b2..031e52f878 100644 --- a/staticlibs/tests/unit/Android.bp +++ b/staticlibs/tests/unit/Android.bp @@ -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", diff --git a/staticlibs/testutils/app/connectivitychecker/Android.bp b/staticlibs/testutils/app/connectivitychecker/Android.bp index f7118cfaa0..049ec9e1b7 100644 --- a/staticlibs/testutils/app/connectivitychecker/Android.bp +++ b/staticlibs/testutils/app/connectivitychecker/Android.bp @@ -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",