summaryrefslogtreecommitdiffstats
path: root/Android.bp
diff options
context:
space:
mode:
authorRemi NGUYEN VAN <reminv@google.com>2020-05-07 18:53:35 +0900
committerRemi NGUYEN VAN <reminv@google.com>2020-05-18 18:26:00 +0900
commit67933143f6d5427c8cf2d23de00c0955e5407096 (patch)
tree10aa2b506c7d4e701aa6569db32f3faf5858e2f5 /Android.bp
parent3f32101a3e41d1ecda5b91a1161e479234de1b86 (diff)
downloadplatform_packages_modules_NetworkStack-67933143f6d5427c8cf2d23de00c0955e5407096.tar.gz
platform_packages_modules_NetworkStack-67933143f6d5427c8cf2d23de00c0955e5407096.tar.bz2
platform_packages_modules_NetworkStack-67933143f6d5427c8cf2d23de00c0955e5407096.zip
Bump NetworkStack to system_30
NetworkStack can use system_30 now that system_30 exists. This change moves the "current" API shims to api30, and adds an api31 shim. Test: atest NetworkStackTests NetworkStackNextTests, manual (Wifi, telephony working) Bug: 143586229 (clean cherry-pick from internal branch) Merged-In: I37ca0e5a8a5c5620f5fed478648853b668e87f50 Change-Id: I37ca0e5a8a5c5620f5fed478648853b668e87f50
Diffstat (limited to 'Android.bp')
-rw-r--r--Android.bp7
1 files changed, 5 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp
index 81a96a8f..efe8ff1f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -48,9 +48,10 @@ java_defaults {
java_defaults {
name: "NetworkStackReleaseApiLevel",
- sdk_version: "system_29",
+ // TODO: use system_30 once a prebuilt SDK is available for R
+ sdk_version: "system_current",
min_sdk_version: "29",
- target_sdk_version: "29",
+ target_sdk_version: "30",
}
// Filegroups for the API shims
@@ -60,6 +61,7 @@ filegroup {
"apishim/common/**/*.java",
"apishim/29/**/*.java",
"apishim/30/**/*.java",
+ "apishim/31/**/*.java",
":networkstack-module-utils-srcs",
],
}
@@ -71,6 +73,7 @@ filegroup {
srcs: [
"apishim/common/**/*.java",
"apishim/29/**/*.java",
+ "apishim/30/**/*.java",
":networkstack-module-utils-srcs",
],
}