Bump NetworkStack to SDK 31
- Set build SDK to module_31 instead of system_30 in release
target
- Set target SDK to 31 in release target instead of 30
- Update version codes as per convention
- Move "current" shim library to api31 shims
- Add new "current" shim library for next development SDK
Ignore-AOSP-First: SDK 31 does not exist in AOSP. Will be partially
cherry-picked.
Bug: 189581241
Test: atest NetworkStackTests NetworkStackNextTests \
CtsNetTestCasesLatestSdk
Change-Id: Ia55598123a5d4432464e9d1b1c637e9e0b58dd8e
diff --git a/Android.bp b/Android.bp
index 0b17b14..367c542 100644
--- a/Android.bp
+++ b/Android.bp
@@ -53,9 +53,14 @@
java_defaults {
name: "NetworkStackReleaseApiLevel",
- sdk_version: "system_30",
+ sdk_version: "module_31",
min_sdk_version: "29",
- target_sdk_version: "30",
+ target_sdk_version: "31",
+ libs: [
+ "framework-connectivity",
+ "framework-statsd",
+ "framework-wifi",
+ ]
}
// Libraries for the API shims
@@ -133,6 +138,27 @@
"NetworkStackApi30Shims",
"framework-connectivity",
],
+ sdk_version: "module_31",
+ visibility: ["//visibility:private"],
+}
+
+
+// Shims for APIs being added to the current development version of Android. These APIs are not
+// stable and have no defined version number. These could be called 10000, but they use the next
+// integer so if the next SDK release happens to use that integer, we don't need to rename them.
+java_library {
+ name: "NetworkStackApi32Shims",
+ defaults: ["NetworkStackShimsDefaults"],
+ srcs: [
+ "apishim/32/**/*.java",
+ ],
+ libs: [
+ "NetworkStackShimsCommon",
+ "NetworkStackApi29Shims",
+ "NetworkStackApi30Shims",
+ "NetworkStackApi31Shims",
+ "framework-connectivity",
+ ],
sdk_version: "module_current",
visibility: ["//visibility:private"],
}
@@ -148,6 +174,7 @@
"NetworkStackApi29Shims",
"NetworkStackApi30Shims",
"NetworkStackApi31Shims",
+ "NetworkStackApi32Shims",
],
sdk_version: "module_current",
visibility: [
@@ -166,9 +193,10 @@
"NetworkStackShimsCommon",
"NetworkStackApi29Shims",
"NetworkStackApi30Shims",
+ "NetworkStackApi31Shims",
],
jarjar_rules: "apishim/jarjar-rules-compat.txt",
- sdk_version: "system_30",
+ sdk_version: "module_31",
visibility: [
"//packages/modules/Connectivity/Tethering",
"//packages/modules/Connectivity/tests/cts/net",