aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-10-25 07:42:29 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-10-25 07:42:29 +0000
commit33de20691f39b2ff98f39fe9dc62c15c3be62eb5 (patch)
tree342bbbfbe5c03dea093c7c8545e454423cd553a1
parent022e93806906cda4734535f85f90ab4704cfeca7 (diff)
parent368cb2c30d9ad5c068ef276b433a8e79298f2f6f (diff)
downloadlibcore-33de20691f39b2ff98f39fe9dc62c15c3be62eb5.tar.gz
Snap for 9214059 from 368cb2c30d9ad5c068ef276b433a8e79298f2f6f to mainline-extservices-releaseaml_ext_331312000
Change-Id: Ic114aef95cec48bf9f32f09d19466235363f3661
-rw-r--r--JavaLibrary.bp4
-rw-r--r--expectations/Android.bp4
2 files changed, 8 insertions, 0 deletions
diff --git a/JavaLibrary.bp b/JavaLibrary.bp
index f070571623d..da7aacef9a4 100644
--- a/JavaLibrary.bp
+++ b/JavaLibrary.bp
@@ -531,6 +531,8 @@ java_library_static {
srcs: ["support/src/test/java/**/*.java"],
sdk_version: "core_platform",
+ // Make sure that this will be added to the sdk snapshot for S.
+ min_sdk_version: "S",
libs: ["junit"],
static_libs: [
"bouncycastle-unbundled",
@@ -1120,4 +1122,6 @@ java_library {
":api_surface_annotation_files",
],
sdk_version: "core_current",
+ // Make sure that this will be added to the sdk snapshot for S.
+ min_sdk_version: "S",
}
diff --git a/expectations/Android.bp b/expectations/Android.bp
index 2aadab932ee..6a6122728e7 100644
--- a/expectations/Android.bp
+++ b/expectations/Android.bp
@@ -35,6 +35,8 @@ java_library {
visibility: expectations_visibility,
java_resources: ["knownfailures.txt"],
sdk_version: "core_current",
+ // Make sure that this will be added to the sdk snapshot for S.
+ min_sdk_version: "S",
}
java_library {
@@ -42,4 +44,6 @@ java_library {
visibility: expectations_visibility,
java_resources: ["virtualdeviceknownfailures.txt"],
sdk_version: "core_current",
+ // Make sure that this will be added to the sdk snapshot for S.
+ min_sdk_version: "S",
}