summaryrefslogtreecommitdiff
path: root/Android.bp
diff options
context:
space:
mode:
authorRemi NGUYEN VAN <reminv@google.com>2020-05-18 07:07:09 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-05-18 07:07:09 +0000
commitb3c3728a99bf6e026b25bec85c47cf974affd56f (patch)
treedd35a6197f7a59e4dacac52cd972b88a6771f845 /Android.bp
parent334edda119a8a669f999551aa3718d092e8214cc (diff)
parentb204e4f35056af596ffdba4f8133d64fc89901d1 (diff)
Merge "Bump NetworkStack to system_30" into rvc-dev am: 7bb940e60c am: b204e4f350
Change-Id: Ie46825ae3ab819b3a1acac32cb62c36e28e50ae8
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 81a96a8..efe8ff1 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",
],
}